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.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.65 by root, Thu Jun 8 01:51:32 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 [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;
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 {
… …
439 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
440 626
441 $win 627 $win
442} 628}
443 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
444 632
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
641
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643
644 for my $x (0..2) {
645 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry
648 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 );
651 }
652 }
653
654
655 $table
656}
657
445sub make_stats_window { 658sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
448 x => "max", 661 x => "max",
449 title => "Stats", 662 title => "Stats",
450 name => "stats_window"; 663 name => "stats_window";
… …
660 873
661 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
662 875
663 $table->clear; 876 $table->clear;
664 877
878 my @tip = (
879 "The current number of users logged in on the server.",
880 "The hostname of the server.",
881 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.",
884 );
665 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 886 $table->add ($_, 0, new CFClient::UI::Label
887 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 890 for 0 .. $#col;
668 891
669 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
670 893
671 my $y = 0; 894 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 912
690 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
691 914
692 $y++; 915 $y++;
693 916
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 918 (new CFClient::UI::Button
919 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility; 923 $METASERVER->hide;
924 },
698 }), 925 ),
699 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
700 ]); 927 ]);
701 928
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 930 ellipsise => 0,
931 align => $align[$_],
932 text => $m->[$_],
933 tooltip => $tip[$_],
934 can_hover => 1,
935 can_events => 1,
936 fontsize => 0.8)
704 for 0 .. $#$m; 937 for 0 .. $#$m;
705 } 938 }
706 } 939 }
707 }); 940 });
708} 941}
709 942
710sub metaserver_dialog { 943sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 945 title => "Server List",
713 name => 'metaserver_dialog', 946 name => 'metaserver_dialog',
714 x => 'center', 947 x => 'center',
715 y => 'center', 948 y => 'center',
949 z => 3,
950 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 952 on_visibility_change => sub {
718 update_metaserver if $_[1]; 953 update_metaserver if $_[1];
719 }, 954 },
720 ; 955 ;
721 956
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 960
724 $dialog 961 $dialog
725} 962}
726 963
727sub server_setup { 964sub server_setup {
… …
750 expand => 1, 987 expand => 1,
751 text => "Server List", 988 text => "Server List",
752 other => $METASERVER, 989 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 ); 993 );
756 } 994 }
757 995
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
849 title => "Messages", 1087 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
852 x => "max", 1090 x => "max",
853 y => 0, 1091 y => 0,
854 force_w => $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
857 1095
858 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
859 1097
860 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
903sub open_quit_dialog { 1141sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1142 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1144 x => "center",
907 y => "center", 1145 y => "center",
1146 z => 50,
908 title => "Really Quit?", 1147 title => "Really Quit?",
909 ; 1148 ;
910 1149
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1151
… …
934sub autopickup_setup { 1173sub autopickup_setup {
935 my $table = new CFClient::UI::Table; 1174 my $table = new CFClient::UI::Table;
936 1175
937 for ( 1176 for (
938 ["General", 0, 0, 1177 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1178 ["Enable autopickup" => PICKUP_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1179 ["Inhibit autopickup" => PICKUP_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1180 ["Stop before pickup" => PICKUP_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1181 ["Debug autopickup" => PICKUP_DEBUG],
943 ], 1182 ],
944 ["Weapons", 0, 6, 1183 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1184 ["All weapons" => PICKUP_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1185 ["Missile weapons" => PICKUP_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW], 1186 ["Bows" => PICKUP_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW], 1187 ["Arrows" => PICKUP_ARROW],
949 ], 1188 ],
950 ["Armour", 0, 12, 1189 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET], 1190 ["Helmets" => PICKUP_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD], 1191 ["Shields" => PICKUP_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1192 ["Body Armour" => PICKUP_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS], 1193 ["Boots" => PICKUP_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1194 ["Gloves" => PICKUP_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1195 ["Cloaks" => PICKUP_CLOAK],
957 ], 1196 ],
958 1197
959 ["Readables", 2, 2, 1198 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1199 ["Spellbooks" => PICKUP_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
963 ], 1202 ],
964 ["Misc", 2, 7, 1203 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD], 1204 ["Food" => PICKUP_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK], 1205 ["Drinks" => PICKUP_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY], 1207 ["Keys" => PICKUP_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1208 ["Magical Items" => PICKUP_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION], 1209 ["Potions" => PICKUP_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1212 ["Jewelery" => PICKUP_JEWELS],
974 ], 1213 ],
975 ) 1214 )
976 { 1215 {
977 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1217 $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); 1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask, 1225 state => $CFG->{pickup} & $mask,
987 on_changed => sub { 1226 on_changed => sub {
988 my ($box, $value) = @_; 1227 my ($box, $value) = @_;
1228
989 if ($value) { 1229 if ($value) {
990 $::CFG->{pickup} |= $mask; 1230 $::CFG->{pickup} |= $mask;
991 } else { 1231 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1232 $::CFG->{pickup} &= ~$mask;
993 } 1233 }
1234
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1235 $::CONN->send_command ("pickup $::CFG->{pickup}")
995 if defined $::CONN; 1236 if defined $::CONN;
996 }); 1237 });
997 } 1238 }
998 } 1239 }
999 1240
1000 $table 1241 $table
1001} 1242}
1002 1243
1003sub make_inventory_window { 1244sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1246 x => "center",
1006 y => "center", 1247 y => "center",
1007 force_w => $WIDTH * 9/10, 1248 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1249 force_h => $HEIGHT * 9/10,
… …
1100 $SETUP_DIALOG->show; 1341 $SETUP_DIALOG->show;
1101 }, 1342 },
1102 sub { 1343 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show; 1345 $SETUP_DIALOG->show;
1105 }); 1346 },
1347 );
1106 $SETUP_DIALOG->hide; 1348 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show; 1349 $::BIND_EDITOR->show;
1108 }, 1350 },
1109 ); 1351 );
1110 1352
… …
1120 $refresh->(); 1362 $refresh->();
1121 1363
1122 $vb 1364 $vb
1123} 1365}
1124 1366
1125sub make_help_window { 1367sub help_window {
1126 my $win = new CFClient::UI::FancyFrame 1368 my $win = new CFClient::UI::FancyFrame
1127 x => 'center', 1369 x => 'center',
1128 y => 'center', 1370 y => 'center',
1371 z => 2,
1129 name => 'doc_browser', 1372 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8, 1373 force_w => int $WIDTH * 7/8,
1131 force_h => int $HEIGHT * 7/8, 1374 force_h => int $HEIGHT * 7/8,
1132 title => "Documentation"; 1375 title => "Documentation";
1133 1376
1134 $win->add (my $vbox = new CFClient::UI::VBox); 1377 $win->add (my $vbox = new CFClient::UI::VBox);
1135 1378
1136 $vbox->add (my $buttons = new CFClient::UI::HBox); 1379 $vbox->add (my $buttons = new CFClient::UI::HBox);
1137 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1381 expand => 1, fontsize => 0.8, padding_x => 4);
1138 1382
1139 for ( 1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef,
1386 options => [
1140 [intro => "Introduction"], 1387 [intro => "Introduction"],
1141 [manual => "Manual"], 1388 [manual => "Manual"],
1389 [skill_help => "Skills"],
1142 [command_help => "Commands"], 1390 [command_help => "Commands"],
1143 [skill_help => "Skills"], 1391 [dmcommand_help => "DM Commands"],
1144 ) { 1392 [COPYING => "License Terms"],
1145 my ($pod, $label) = @$_; 1393 ],
1394 on_changed => sub {
1395 my ($self, $pod) = @_;
1146 1396
1147 $buttons->add (new CFClient::UI::Button 1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1148 text => $label, 1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1149 on_activate => sub {
1150 my $parser = new Pod::POM;
1151 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1152 1399
1153 $viewer->clear; 1400 $viewer->clear;
1154 1401
1155 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1156 for @{ CFClient::pod_to_pango_list $pom }; 1403 for @$pom;
1157 1404
1158 $viewer->set_offset (0); 1405 $viewer->set_offset (0);
1159 }, 1406 },
1407 on_visibility_change => sub {
1408 my ($self, $visible) = @_;
1409 return unless $visible;
1410 return if $self->{value};
1411 $self->set_value ("intro");
1412 },
1160 ); 1413 );
1161 }
1162
1163 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1164 1414
1165 $win 1415 $win
1166} 1416}
1167 1417
1168sub sdl_init { 1418sub sdl_init {
… …
1208 $DEBUG_STATUS->show; 1458 $DEBUG_STATUS->show;
1209 1459
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211 1461
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1462 $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]); 1463 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1214 1464
1215 (new CFClient::UI::Frame 1465 (new CFClient::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1466 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1467 force_x => 0,
1218 force_y => "max", 1468 force_y => "max",
… …
1245 } 1495 }
1246 }); 1496 });
1247 $MAPWIDGET->show; 1497 $MAPWIDGET->show;
1248 $MAPWIDGET->focus_in; 1498 $MAPWIDGET->focus_in;
1249 1499
1250 $LOGVIEW = new CFClient::UI::TextView 1500 $LOGVIEW = new CFClient::UI::TextScroller
1251 expand => 1, 1501 expand => 1,
1252 font => $FONT_FIXED, 1502 font => $FONT_FIXED,
1253 fontsize => $::CFG->{log_fontsize}, 1503 fontsize => $::CFG->{log_fontsize},
1504 indent => -4,
1254 can_hover => 1, 1505 can_hover => 1,
1255 can_events => 1, 1506 can_events => 1,
1256 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1507 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1257 ; 1508 ;
1258 1509
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1510 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1260 title => "Setup", 1511 title => "Setup",
1261 name => "setup_dialog", 1512 name => "setup_dialog",
1262 x => 'center', 1513 x => 'center',
1263 y => 'center', 1514 y => 'center',
1515 z => 2,
1264 force_w => $::WIDTH * 0.6, 1516 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1517 force_h => $::HEIGHT * 0.6,
1266 ; 1518 ;
1267 1519
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1520 $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); 1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1270 1522
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "Configure the server to play on, your username, password and other server-related options."); 1524 "Configure the server to play on, your username, password and other server-related options.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1525 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1526 "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, 1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1528 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1529 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1530 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1532 "Lets you define, edit and delete bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1533 . "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 " 1534 . "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." 1535 . "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 " 1536 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1537 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask.");
1288 1542
1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1290 1544
1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1545 $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."); 1546 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1293 1547
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1548 $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."); 1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1296 1550
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 1551 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 1552
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1553 $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."); 1554 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, 1555 $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 :). " 1556 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."); 1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1558
1305 $BUTTONBAR->add (new CFClient::UI::Button 1559 $BUTTONBAR->add (new CFClient::UI::Button
1306 text => "Save Config", 1560 text => "Save Config",
1307 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1561 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1308 on_activate => sub { 1562 on_activate => sub {
… …
1310 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1311 status "Configuration Saved"; 1565 status "Configuration Saved";
1312 }, 1566 },
1313 ); 1567 );
1314 1568
1315 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1316 tooltip => "View Documentation"); 1570 tooltip => "View Documentation");
1317 1571
1318 $BUTTONBAR->add (new CFClient::UI::Button 1572 $BUTTONBAR->add (new CFClient::UI::Button
1319 text => "Quit", 1573 text => "Quit",
1320 tooltip => "Terminates the program", 1574 tooltip => "Terminates the program",
… …
1568 map_scale => 1, 1822 map_scale => 1,
1569 fow_enable => 1, 1823 fow_enable => 1,
1570 fow_intensity => 0.45, 1824 fow_intensity => 0.45,
1571 fow_smooth => 0, 1825 fow_smooth => 0,
1572 gui_fontsize => 1, 1826 gui_fontsize => 1,
1573 log_fontsize => 1, 1827 log_fontsize => 0.7,
1574 gauge_fontsize=> 1, 1828 gauge_fontsize=> 1,
1575 gauge_size => 0.35, 1829 gauge_size => 0.35,
1576 stat_fontsize => 1, 1830 stat_fontsize => 0.7,
1577 mapsize => 100, 1831 mapsize => 100,
1578 host => "crossfire.schmorp.de", 1832 host => "crossfire.schmorp.de",
1579 say_command => 'say', 1833 say_command => 'say',
1580 audio_enable => 1, 1834 audio_enable => 1,
1581 bgm_enable => 1, 1835 bgm_enable => 1,
1582 bgm_volume => 0.25, 1836 bgm_volume => 0.25,
1583 face_prefetch => 0, 1837 face_prefetch => 0,
1584 output_sync => 1, 1838 output_sync => 1,
1585 output_count => 1, 1839 output_count => 1,
1840 pickup => 0,
1586 ); 1841 );
1587 1842
1588 while (my ($k, $v) = each %DEF_CFG) { 1843 while (my ($k, $v) = each %DEF_CFG) {
1589 $CFG->{$k} = $v unless exists $CFG->{$k}; 1844 $CFG->{$k} = $v unless exists $CFG->{$k};
1590 } 1845 }

Diff Legend

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