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.52 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
47 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
90our $SETUP_NOTEBOOK; 91our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 92our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 93our $SETUP_KEYBOARD;
93our $SETUP_SPELLS; 94our $SETUP_SPELLS;
94 95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
95our $FLOORBOX; 98our $FLOORBOX;
96our $GAUGES; 99our $GAUGES;
97our $STATWIDS; 100our $STATWIDS;
98 101
99our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
121} 124}
122 125
123sub debug { 126sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
128}
129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
125} 309}
126 310
127sub start_game { 311sub start_game {
128 status "logging in..."; 312 status "logging in...";
129 313
… …
148 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 333 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
151 map => $MAP, 335 map => $MAP,
152 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
153 338
154 sound_play => sub { 339 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
156 341
157 $SDL_MIXER 342 $SDL_MIXER
… …
174 } 359 }
175} 360}
176 361
177sub stop_game { 362sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 365 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182 367
183 return unless $CONN; 368 return unless $CONN;
184 369
185 status "connection closed"; 370 status "connection closed";
186 371
372 destroy_query_dialog $CONN;
187 $CONN->destroy; 373 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
189} 375}
190 376
191sub graphics_setup { 377sub graphics_setup {
… …
440 626
441 $win 627 $win
442} 628}
443 629
444 630
445sub make_stats_window { 631sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
448 x => "max", 634 x => "max",
449 title => "Stats", 635 title => "Stats",
450 name => "stats_window"; 636 name => "stats_window";
… …
660 846
661 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
662 848
663 $table->clear; 849 $table->clear;
664 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
665 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 863 for 0 .. $#col;
668 864
669 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
670 866
671 my $y = 0; 867 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 885
690 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
691 887
692 $y++; 888 $y++;
693 889
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility; 896 $METASERVER->hide;
897 },
698 }), 898 ),
699 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
700 ]); 900 ]);
701 901
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
704 for 0 .. $#$m; 910 for 0 .. $#$m;
705 } 911 }
706 } 912 }
707 }); 913 });
708} 914}
709 915
710sub metaserver_dialog { 916sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame 917 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 918 title => "Server List",
713 name => 'metaserver_dialog', 919 name => 'metaserver_dialog',
714 x => 'center', 920 x => 'center',
715 y => 'center', 921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 924 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 925 on_visibility_change => sub {
718 update_metaserver if $_[1]; 926 update_metaserver if $_[1];
719 }, 927 },
720 ; 928 ;
721 929
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 933
724 $dialog 934 $dialog
725} 935}
726 936
727sub server_setup { 937sub server_setup {
… …
750 expand => 1, 960 expand => 1,
751 text => "Server List", 961 text => "Server List",
752 other => $METASERVER, 962 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 964 on_activate => sub { $METASERVER->toggle_visibility },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 ); 966 );
756 } 967 }
757 968
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
849 title => "Messages", 1060 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
852 x => "max", 1063 x => "max",
853 y => 0, 1064 y => 0,
854 force_w => $::WIDTH / 3, 1065 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
857 1068
858 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
859 1070
860 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
903sub open_quit_dialog { 1114sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1117 x => "center",
907 y => "center", 1118 y => "center",
1119 z => 50,
908 title => "Really Quit?", 1120 title => "Really Quit?",
909 ; 1121 ;
910 1122
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1124
… …
934sub autopickup_setup { 1146sub autopickup_setup {
935 my $table = new CFClient::UI::Table; 1147 my $table = new CFClient::UI::Table;
936 1148
937 for ( 1149 for (
938 ["General", 0, 0, 1150 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1151 ["Enable autopickup" => PICKUP_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1152 ["Inhibit autopickup" => PICKUP_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1153 ["Stop before pickup" => PICKUP_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1154 ["Debug autopickup" => PICKUP_DEBUG],
943 ], 1155 ],
944 ["Weapons", 0, 6, 1156 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1157 ["All weapons" => PICKUP_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1158 ["Missile weapons" => PICKUP_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW], 1159 ["Bows" => PICKUP_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW], 1160 ["Arrows" => PICKUP_ARROW],
949 ], 1161 ],
950 ["Armour", 0, 12, 1162 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET], 1163 ["Helmets" => PICKUP_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD], 1164 ["Shields" => PICKUP_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1165 ["Body Armour" => PICKUP_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS], 1166 ["Boots" => PICKUP_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1167 ["Gloves" => PICKUP_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1168 ["Cloaks" => PICKUP_CLOAK],
957 ], 1169 ],
958 1170
959 ["Readables", 2, 2, 1171 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1172 ["Spellbooks" => PICKUP_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1173 ["Skillscrolls" => PICKUP_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1174 ["Normal Books/Scrolls" => PICKUP_READABLES],
963 ], 1175 ],
964 ["Misc", 2, 7, 1176 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD], 1177 ["Food" => PICKUP_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK], 1178 ["Drinks" => PICKUP_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY], 1180 ["Keys" => PICKUP_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1181 ["Magical Items" => PICKUP_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION], 1182 ["Potions" => PICKUP_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1184 ["Ignore cursed" => PICKUP_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1185 ["Jewelery" => PICKUP_JEWELS],
974 ], 1186 ],
975 ) 1187 )
976 { 1188 {
977 my ($title, $x, $y, @bits) = @$_; 1189 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
… …
998 } 1210 }
999 1211
1000 $table 1212 $table
1001} 1213}
1002 1214
1003sub make_inventory_window { 1215sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1216 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1217 x => "center",
1006 y => "center", 1218 y => "center",
1007 force_w => $WIDTH * 9/10, 1219 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1220 force_h => $HEIGHT * 9/10,
… …
1100 $SETUP_DIALOG->show; 1312 $SETUP_DIALOG->show;
1101 }, 1313 },
1102 sub { 1314 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1315 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show; 1316 $SETUP_DIALOG->show;
1105 }); 1317 },
1318 );
1106 $SETUP_DIALOG->hide; 1319 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show; 1320 $::BIND_EDITOR->show;
1108 }, 1321 },
1109 ); 1322 );
1110 1323
… …
1124 1337
1125sub make_help_window { 1338sub make_help_window {
1126 my $win = new CFClient::UI::FancyFrame 1339 my $win = new CFClient::UI::FancyFrame
1127 x => 'center', 1340 x => 'center',
1128 y => 'center', 1341 y => 'center',
1342 z => 2,
1129 name => 'doc_browser', 1343 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8, 1344 force_w => int $WIDTH * 7/8,
1131 force_h => int $HEIGHT * 7/8, 1345 force_h => int $HEIGHT * 7/8,
1132 title => "Documentation"; 1346 title => "Documentation";
1133 1347
… …
1145 my ($pod, $label) = @$_; 1359 my ($pod, $label) = @$_;
1146 1360
1147 $buttons->add (new CFClient::UI::Button 1361 $buttons->add (new CFClient::UI::Button
1148 text => $label, 1362 text => $label,
1149 on_activate => sub { 1363 on_activate => sub {
1150 my $parser = new Pod::POM; 1364 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1365 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152 1366
1153 $viewer->clear; 1367 $viewer->clear;
1154 1368
1155 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1369 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1156 for @{ CFClient::pod_to_pango_list $pom }; 1370 for @$pom;
1157 1371
1158 $viewer->set_offset (0); 1372 $viewer->set_offset (0);
1159 }, 1373 },
1160 ); 1374 );
1161 } 1375 }
… …
1208 $DEBUG_STATUS->show; 1422 $DEBUG_STATUS->show;
1209 1423
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1424 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211 1425
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1426 $STATUSBOX = new CFClient::UI::Statusbox;
1213 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1427 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1214 1428
1215 (new CFClient::UI::Frame 1429 (new CFClient::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1430 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1431 force_x => 0,
1218 force_y => "max", 1432 force_y => "max",
… …
1249 1463
1250 $LOGVIEW = new CFClient::UI::TextView 1464 $LOGVIEW = new CFClient::UI::TextView
1251 expand => 1, 1465 expand => 1,
1252 font => $FONT_FIXED, 1466 font => $FONT_FIXED,
1253 fontsize => $::CFG->{log_fontsize}, 1467 fontsize => $::CFG->{log_fontsize},
1468 indent => -4,
1254 can_hover => 1, 1469 can_hover => 1,
1255 can_events => 1, 1470 can_events => 1,
1256 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1471 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1257 ; 1472 ;
1258 1473
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1474 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1260 title => "Setup", 1475 title => "Setup",
1261 name => "setup_dialog", 1476 name => "setup_dialog",
1262 x => 'center', 1477 x => 'center',
1263 y => 'center', 1478 y => 'center',
1479 z => 2,
1264 force_w => $::WIDTH * 0.6, 1480 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1481 force_h => $::HEIGHT * 0.6,
1266 ; 1482 ;
1267 1483
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1484 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1269 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1485 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1270 1486
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1487 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "Configure the server to play on, your username, password and other server-related options."); 1488 "Configure the server to play on, your username, password and other server-related options.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1489 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1490 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1275 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1491 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1492 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1493 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1494 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1495 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1496 "Lets you define, edit and delete bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1497 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1282 . "with nothing set and the recording started. After doing the actions you " 1498 . "with nothing set and the recording started. After doing the actions you "
1283 . "want to record press Insert and you will be asked to press a key-combo. " 1499 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1284 . "After pressing the combo the binding will be saved automatically and the " 1500 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1501 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1502 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1503 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1288 1504
1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1505 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1290 1506
1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1292 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1508 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1293 1509
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1510 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1295 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1511 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1296 1512
1297 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1513 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1298 1514
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1515 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1300 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1516 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1302 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1518 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1303 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1519 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1520
1305 $BUTTONBAR->add (new CFClient::UI::Button 1521 $BUTTONBAR->add (new CFClient::UI::Button
1306 text => "Save Config", 1522 text => "Save Config",
… …
1568 map_scale => 1, 1784 map_scale => 1,
1569 fow_enable => 1, 1785 fow_enable => 1,
1570 fow_intensity => 0.45, 1786 fow_intensity => 0.45,
1571 fow_smooth => 0, 1787 fow_smooth => 0,
1572 gui_fontsize => 1, 1788 gui_fontsize => 1,
1573 log_fontsize => 1, 1789 log_fontsize => 0.7,
1574 gauge_fontsize=> 1, 1790 gauge_fontsize=> 1,
1575 gauge_size => 0.35, 1791 gauge_size => 0.35,
1576 stat_fontsize => 1, 1792 stat_fontsize => 0.7,
1577 mapsize => 100, 1793 mapsize => 100,
1578 host => "crossfire.schmorp.de", 1794 host => "crossfire.schmorp.de",
1579 say_command => 'say', 1795 say_command => 'say',
1580 audio_enable => 1, 1796 audio_enable => 1,
1581 bgm_enable => 1, 1797 bgm_enable => 1,

Diff Legend

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