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.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.64 by root, Wed Jun 7 06:28:30 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 44
43$Event::DIED = sub { 45$Event::DIED = sub {
44 # TODO: display dialog box or so 46 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
89our $SETUP_NOTEBOOK; 91our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 92our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 93our $SETUP_KEYBOARD;
92our $SETUP_SPELLS; 94our $SETUP_SPELLS;
93 95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
94our $FLOORBOX; 98our $FLOORBOX;
95our $GAUGES; 99our $GAUGES;
96our $STATWIDS; 100our $STATWIDS;
97 101
98our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
119 $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]);
120} 124}
121 125
122sub debug { 126sub debug {
123 $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 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "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;
124} 309}
125 310
126sub start_game { 311sub start_game {
127 status "logging in..."; 312 status "logging in...";
128 313
… …
147 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 333 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
150 map => $MAP, 335 map => $MAP,
151 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
152 338
153 sound_play => sub { 339 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
155 341
156 $SDL_MIXER 342 $SDL_MIXER
… …
181 367
182 return unless $CONN; 368 return unless $CONN;
183 369
184 status "connection closed"; 370 status "connection closed";
185 371
372 destroy_query_dialog $CONN;
186 $CONN->destroy; 373 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
188} 375}
189 376
190sub graphics_setup { 377sub graphics_setup {
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 x => "max", 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
… …
659 846
660 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
661 848
662 $table->clear; 849 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 863 for 0 .. $#col;
667 864
668 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
669 866
670 my $y = 0; 867 my $y = 0;
671 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) {
… …
688 885
689 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
690 887
691 $y++; 888 $y++;
692 889
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST_ENTRY->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility; 896 $METASERVER->hide;
897 },
697 }), 898 ),
698 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
699 ]); 900 ]);
700 901
701 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
702 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)
703 for 0 .. $#$m; 910 for 0 .. $#$m;
704 } 911 }
705 } 912 }
706 }); 913 });
707} 914}
708 915
709sub metaserver_dialog { 916sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame 917 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List", 918 title => "Server List",
712 name => 'metaserver_dialog', 919 name => 'metaserver_dialog',
713 x => 'center', 920 x => 'center',
714 y => 'center', 921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
715 child => (my $vbox = new CFClient::UI::VBox), 924 child => (my $vbox = new CFClient::UI::VBox),
716 on_visibility_change => sub { 925 on_visibility_change => sub {
717 update_metaserver if $_[1]; 926 update_metaserver if $_[1];
718 }, 927 },
719 ; 928 ;
720 929
721 $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});
722 933
723 $dialog 934 $dialog
724} 935}
725 936
726sub server_setup { 937sub server_setup {
… …
749 expand => 1, 960 expand => 1,
750 text => "Server List", 961 text => "Server List",
751 other => $METASERVER, 962 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
753 on_activate => sub { $METASERVER->toggle_visibility }, 964 on_activate => sub { $METASERVER->toggle_visibility },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
754 ); 966 );
755 } 967 }
756 968
757 $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");
758 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
848 title => "Messages", 1060 title => "Messages",
849 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
850 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
851 x => "max", 1063 x => "max",
852 y => 0, 1064 y => 0,
853 force_w => $::WIDTH / 3, 1065 force_w => $::WIDTH * 0.4,
854 force_h => $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
855 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
856 1068
857 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
858 1070
859 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
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]);
… …
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask, 1198 state => $CFG->{pickup} & $mask,
987 on_changed => sub { 1199 on_changed => sub {
988 my ($box, $value) = @_; 1200 my ($box, $value) = @_;
1201
989 if ($value) { 1202 if ($value) {
990 $::CFG->{pickup} |= $mask; 1203 $::CFG->{pickup} |= $mask;
991 } else { 1204 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1205 $::CFG->{pickup} &= ~$mask;
993 } 1206 }
1207
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
995 if defined $::CONN; 1209 if defined $::CONN;
996 }); 1210 });
997 } 1211 }
998 } 1212 }
999 1213
1000 $table 1214 $table
1001} 1215}
1002 1216
1003sub make_inventory_window { 1217sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1219 x => "center",
1006 y => "center", 1220 y => "center",
1007 force_w => $WIDTH * 9/10, 1221 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1222 force_h => $HEIGHT * 9/10,
… …
1121 $refresh->(); 1335 $refresh->();
1122 1336
1123 $vb 1337 $vb
1124} 1338}
1125 1339
1126sub make_help_window { 1340sub help_window {
1127 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
1128 x => 'center', 1342 x => 'center',
1129 y => 'center', 1343 y => 'center',
1130 z => 2, 1344 z => 2,
1131 name => 'doc_browser', 1345 name => 'doc_browser',
… …
1134 title => "Documentation"; 1348 title => "Documentation";
1135 1349
1136 $win->add (my $vbox = new CFClient::UI::VBox); 1350 $win->add (my $vbox = new CFClient::UI::VBox);
1137 1351
1138 $vbox->add (my $buttons = new CFClient::UI::HBox); 1352 $vbox->add (my $buttons = new CFClient::UI::HBox);
1139 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1353 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1354 expand => 1, fontsize => 0.8, padding_x => 4);
1140 1355
1141 for ( 1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox
1358 value => undef,
1359 options => [
1142 [intro => "Introduction"], 1360 [intro => "Introduction"],
1143 [manual => "Manual"], 1361 [manual => "Manual"],
1362 [skill_help => "Skills"],
1144 [command_help => "Commands"], 1363 [command_help => "Commands"],
1145 [skill_help => "Skills"], 1364 [dmcommand_help => "DM Commands"],
1146 ) { 1365 [COPYING => "License Terms"],
1147 my ($pod, $label) = @$_; 1366 ],
1367 on_changed => sub {
1368 my ($self, $pod) = @_;
1148 1369
1149 $buttons->add (new CFClient::UI::Button
1150 text => $label,
1151 on_activate => sub {
1152 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod"; 1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1153 1372
1154 $viewer->clear; 1373 $viewer->clear;
1155 1374
1156 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157 for @{ CFClient::pod_to_pango_list $pom }; 1376 for @$pom;
1158 1377
1159 $viewer->set_offset (0); 1378 $viewer->set_offset (0);
1160 }, 1379 },
1380 on_visibility_change => sub {
1381 my ($self, $visible) = @_;
1382 return unless $visible;
1383 return if $self->{value};
1384 $self->set_value ("intro");
1385 },
1161 ); 1386 );
1162 }
1163
1164 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1165 1387
1166 $win 1388 $win
1167} 1389}
1168 1390
1169sub sdl_init { 1391sub sdl_init {
… …
1246 } 1468 }
1247 }); 1469 });
1248 $MAPWIDGET->show; 1470 $MAPWIDGET->show;
1249 $MAPWIDGET->focus_in; 1471 $MAPWIDGET->focus_in;
1250 1472
1251 $LOGVIEW = new CFClient::UI::TextView 1473 $LOGVIEW = new CFClient::UI::TextScroller
1252 expand => 1, 1474 expand => 1,
1253 font => $FONT_FIXED, 1475 font => $FONT_FIXED,
1254 fontsize => $::CFG->{log_fontsize}, 1476 fontsize => $::CFG->{log_fontsize},
1477 indent => -4,
1255 can_hover => 1, 1478 can_hover => 1,
1256 can_events => 1, 1479 can_events => 1,
1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1480 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258 ; 1481 ;
1259 1482
… …
1266 force_w => $::WIDTH * 0.6, 1489 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6, 1490 force_h => $::HEIGHT * 0.6,
1268 ; 1491 ;
1269 1492
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1493 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 1495
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1496 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options."); 1497 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1498 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1499 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1501 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1502 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music."); 1503 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1286 . "After pressing the combo the binding will be saved automatically and the " 1509 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes"); 1510 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1512 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1290 1513
1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1514 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292 1515
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1517 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295 1518
1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1520 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298 1521
1299 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 1522 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
1300 1523
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1524 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1525 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1526 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1527 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1528 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306 1529
1307 $BUTTONBAR->add (new CFClient::UI::Button 1530 $BUTTONBAR->add (new CFClient::UI::Button
1308 text => "Save Config", 1531 text => "Save Config",
… …
1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313 status "Configuration Saved"; 1536 status "Configuration Saved";
1314 }, 1537 },
1315 ); 1538 );
1316 1539
1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318 tooltip => "View Documentation"); 1541 tooltip => "View Documentation");
1319 1542
1320 $BUTTONBAR->add (new CFClient::UI::Button 1543 $BUTTONBAR->add (new CFClient::UI::Button
1321 text => "Quit", 1544 text => "Quit",
1322 tooltip => "Terminates the program", 1545 tooltip => "Terminates the program",
… …
1570 map_scale => 1, 1793 map_scale => 1,
1571 fow_enable => 1, 1794 fow_enable => 1,
1572 fow_intensity => 0.45, 1795 fow_intensity => 0.45,
1573 fow_smooth => 0, 1796 fow_smooth => 0,
1574 gui_fontsize => 1, 1797 gui_fontsize => 1,
1575 log_fontsize => 1, 1798 log_fontsize => 0.7,
1576 gauge_fontsize=> 1, 1799 gauge_fontsize=> 1,
1577 gauge_size => 0.35, 1800 gauge_size => 0.35,
1578 stat_fontsize => 1, 1801 stat_fontsize => 0.7,
1579 mapsize => 100, 1802 mapsize => 100,
1580 host => "crossfire.schmorp.de", 1803 host => "crossfire.schmorp.de",
1581 say_command => 'say', 1804 say_command => 'say',
1582 audio_enable => 1, 1805 audio_enable => 1,
1583 bgm_enable => 1, 1806 bgm_enable => 1,
1584 bgm_volume => 0.25, 1807 bgm_volume => 0.25,
1585 face_prefetch => 0, 1808 face_prefetch => 0,
1586 output_sync => 1, 1809 output_sync => 1,
1587 output_count => 1, 1810 output_count => 1,
1811 pickup => 0,
1588 ); 1812 );
1589 1813
1590 while (my ($k, $v) = each %DEF_CFG) { 1814 while (my ($k, $v) = each %DEF_CFG) {
1591 $CFG->{$k} = $v unless exists $CFG->{$k}; 1815 $CFG->{$k} = $v unless exists $CFG->{$k};
1592 } 1816 }

Diff Legend

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