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.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.67 by root, Sun Jun 11 18:36:15 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];
… …
83our $CONSOLE; 84our $CONSOLE;
84our $METASERVER; 85our $METASERVER;
85our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
86our $QUIT_DIALOG; 87our $QUIT_DIALOG;
87our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
88 90
89our $SETUP_DIALOG; 91our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 93our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
93our $SETUP_SPELLS; 95our $SETUP_SPELLS;
94 96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
95our $FLOORBOX; 99our $FLOORBOX;
96our $GAUGES; 100our $GAUGES;
97our $STATWIDS; 101our $STATWIDS;
98 102
99our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
121} 125}
122 126
123sub debug { 127sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
129}
130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 }
161 );
162 $hbox->add (new CFClient::UI::Button
163 text => "Yes",
164 on_activate => sub {
165 $conn->send ("reply y");
166 destroy_query_dialog $conn;
167 },
168 );
169
170 $dialog->focus_in;
171
172 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show;
177
178 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4,
180 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n";
182
183 unshift @dialog, my $table = new CFClient::UI::Table;
184
185 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race",
187 on_activate => sub {
188 $conn->send ("reply n");
189 destroy_query_dialog $conn;
190 },
191 );
192 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept",
194 on_activate => sub {
195 $conn->send ("reply d");
196 destroy_query_dialog $conn;
197 },
198 );
199
200 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, "
210 . "so you can take your time making this important choice."
211 ;
212
213 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat");
216 destroy_query_dialog $conn;
217 return;
218 }
219
220 $STATS_WINDOW->show;
221 $MESSAGE_WINDOW->hide;
222
223 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4,
225 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n";
227
228 unshift @dialog, my $table = new CFClient::UI::Table;
229
230 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again",
233 on_activate => sub {
234 $conn->send ("reply y");
235 destroy_query_dialog $conn;
236 },
237 );
238
239 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
241 value => $_,
242 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
246 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
247 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
248 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250 ],
251 ), 1 .. 2;
252
253 $table->add (2, 0, new CFClient::UI::Button
254 text => "Swap Stats",
255 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn;
259 },
260 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262
263 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept",
266 on_activate => sub {
267 $conn->send ("reply n");
268 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn;
270 },
271 );
272
273 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4,
275 ellipsise => 0,
276 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats "
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281 . "Race selection will influence those values later on."
282 ;
283 }
284
285 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub {
287 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn;
289 },
290 ;
291
292 $entry->focus_in;
293
294 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296
297 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub {
300 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn;
302 },
303 ;
304
305 $entry->focus_in;
306 }
307
308 $vbox->add (@dialog);
309 $dialog->show;
125} 310}
126 311
127sub start_game { 312sub start_game {
128 status "logging in..."; 313 status "logging in...";
129 314
… …
148 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 334 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
151 map => $MAP, 336 map => $MAP,
152 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
153 339
154 sound_play => sub { 340 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
156 342
157 $SDL_MIXER 343 $SDL_MIXER
… …
174 } 360 }
175} 361}
176 362
177sub stop_game { 363sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 366 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182 368
183 return unless $CONN; 369 return unless $CONN;
184 370
185 status "connection closed"; 371 status "connection closed";
186 372
373 destroy_query_dialog $CONN;
187 $CONN->destroy; 374 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 375 $CONN = 0; # false, does not autovivify
189} 376}
190 377
191sub graphics_setup { 378sub graphics_setup {
… …
439 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
440 627
441 $win 628 $win
442} 629}
443 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
444 633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
445sub make_stats_window { 659sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8), 661 y => $HEIGHT * (2/8),
448 x => "max", 662 x => "max",
449 title => "Stats", 663 title => "Stats",
450 name => "stats_window"; 664 name => "stats_window";
… …
660 874
661 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
662 876
663 $table->clear; 877 $table->clear;
664 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
665 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 891 for 0 .. $#col;
668 892
669 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
670 894
671 my $y = 0; 895 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 913
690 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
691 915
692 $y++; 916 $y++;
693 917
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility; 924 $METASERVER->hide;
925 },
698 }), 926 ),
699 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
700 ]); 928 ]);
701 929
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
704 for 0 .. $#$m; 938 for 0 .. $#$m;
705 } 939 }
706 } 940 }
707 }); 941 });
708} 942}
709 943
710sub metaserver_dialog { 944sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame 945 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 946 title => "Server List",
713 name => 'metaserver_dialog', 947 name => 'metaserver_dialog',
714 x => 'center', 948 x => 'center',
715 y => 'center', 949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 952 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 953 on_visibility_change => sub {
718 update_metaserver if $_[1]; 954 update_metaserver if $_[1];
719 }, 955 },
720 ; 956 ;
721 957
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 961
724 $dialog 962 $dialog
725} 963}
726 964
727sub server_setup { 965sub server_setup {
… …
750 expand => 1, 988 expand => 1,
751 text => "Server List", 989 text => "Server List",
752 other => $METASERVER, 990 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 992 on_activate => sub { $METASERVER->toggle_visibility },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 ); 994 );
756 } 995 }
757 996
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
838 my ($self, $value) = @_; 1077 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1078 $CFG->{say_command} = $value;
840 } 1079 }
841 ); 1080 );
842 1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
843 $vbox 1091 $vbox
844} 1092}
845 1093
846sub message_window { 1094sub message_window {
847 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
… …
849 title => "Messages", 1097 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
852 x => "max", 1100 x => "max",
853 y => 0, 1101 y => 0,
854 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
857 1105
858 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
859 1107
860 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
903sub open_quit_dialog { 1151sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1154 x => "center",
907 y => "center", 1155 y => "center",
1156 z => 50,
908 title => "Really Quit?", 1157 title => "Really Quit?",
909 ; 1158 ;
910 1159
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1161
… …
930 1179
931 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
932} 1181}
933 1182
934sub autopickup_setup { 1183sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox; 1184 my $table = new CFClient::UI::Table;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944 1185
945 for ( 1186 for (
946 ["General", $gen_tbl], 1187 ["General", 0, 0,
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1188 ["Enable autopickup" => PICKUP_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1190 ["Stop before pickup" => PICKUP_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
951 ["Weapons", $ltbl], 1193 ["Weapons", 0, 6,
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1194 ["All weapons" => PICKUP_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW], 1196 ["Bows" => PICKUP_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW], 1197 ["Arrows" => PICKUP_ARROW],
1198 ],
956 ["Armour"], 1199 ["Armour", 0, 12,
957 ["Helmets" => CFClient::Pickup::PU_HELMET], 1200 ["Helmets" => PICKUP_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD], 1201 ["Shields" => PICKUP_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1202 ["Body Armour" => PICKUP_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS], 1203 ["Boots" => PICKUP_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1204 ["Gloves" => PICKUP_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
963 ["Readables", $rtbl], 1208 ["Readables", 2, 2,
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1209 ["Spellbooks" => PICKUP_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
967 ["Misc"], 1213 ["Misc", 2, 7,
968 ["Food" => CFClient::Pickup::PU_FOOD], 1214 ["Food" => PICKUP_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK], 1215 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY], 1217 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1218 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION], 1219 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
977 ) 1225 )
978 { 1226 {
979 if (ref $_->[1]) { 1227 my ($title, $x, $y, @bits) = @$_;
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } elsif (not defined $_->[1]) { 1229
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1230 for (@bits) {
985 } else { 1231 ++$y;
1232
986 my $mask = $_->[1]; 1233 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1236 state => $CFG->{pickup} & $mask,
990 on_changed => sub { 1237 on_changed => sub {
991 my ($box, $value) = @_; 1238 my ($box, $value) = @_;
1239
992 if ($value) { 1240 if ($value) {
993 $::CFG->{pickup} |= $mask; 1241 $::CFG->{pickup} |= $mask;
994 } else { 1242 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1243 $::CFG->{pickup} &= ~$mask;
996 } 1244 }
1245
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1247 if defined $::CONN;
999 }); 1248 });
1000 } 1249 }
1001 } 1250 }
1002 1251
1003 $vb 1252 $table->add (2, 18, new CFClient::UI::ValSlider
1004} 1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1005 1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
1006sub make_inventory_window { 1274sub inventory_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1276 x => "center",
1009 y => "center", 1277 y => "center",
1010 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
… …
1103 $SETUP_DIALOG->show; 1371 $SETUP_DIALOG->show;
1104 }, 1372 },
1105 sub { 1373 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show; 1375 $SETUP_DIALOG->show;
1108 }); 1376 },
1377 );
1109 $SETUP_DIALOG->hide; 1378 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1111 }, 1380 },
1112 ); 1381 );
1113 1382
… …
1123 $refresh->(); 1392 $refresh->();
1124 1393
1125 $vb 1394 $vb
1126} 1395}
1127 1396
1128sub make_help_window { 1397sub help_window {
1129 my $win = new CFClient::UI::FancyFrame 1398 my $win = new CFClient::UI::FancyFrame
1130 x => 'center', 1399 x => 'center',
1131 y => 'center', 1400 y => 'center',
1401 z => 2,
1132 name => 'doc_browser', 1402 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8, 1403 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8, 1404 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation"; 1405 title => "Documentation";
1136 1406
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1407 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1408
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1409 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1412
1142 for ( 1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef,
1416 options => [
1143 [intro => "Introduction"], 1417 [intro => "Introduction"],
1144 [manual => "Manual"], 1418 [manual => "Manual"],
1419 [skill_help => "Skills"],
1145 [command_help => "Commands"], 1420 [command_help => "Commands"],
1146 [skill_help => "Skills"], 1421 [dmcommand_help => "DM Commands"],
1147 ) { 1422 [COPYING => "License Terms"],
1148 my ($pod, $label) = @$_; 1423 ],
1424 on_changed => sub {
1425 my ($self, $pod) = @_;
1149 1426
1150 $buttons->add (new CFClient::UI::Button 1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151 text => $label, 1428 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152 on_activate => sub {
1153 my $parser = new Pod::POM;
1154 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1155 1429
1156 $viewer->clear; 1430 $viewer->clear;
1157 1431
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @{ CFClient::pod_to_pango_list $pom }; 1433 for @$pom;
1160 1434
1161 $viewer->set_offset (0); 1435 $viewer->set_offset (0);
1162 }, 1436 },
1437 on_visibility_change => sub {
1438 my ($self, $visible) = @_;
1439 return unless $visible;
1440 return if $self->{value};
1441 $self->set_value ("intro");
1442 },
1163 ); 1443 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1444
1168 $win 1445 $win
1169} 1446}
1170 1447
1171sub sdl_init { 1448sub sdl_init {
… …
1211 $DEBUG_STATUS->show; 1488 $DEBUG_STATUS->show;
1212 1489
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214 1491
1215 $STATUSBOX = new CFClient::UI::Statusbox; 1492 $STATUSBOX = new CFClient::UI::Statusbox;
1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217 1494
1218 (new CFClient::UI::Frame 1495 (new CFClient::UI::Frame
1219 bg => [0, 0, 0, 0.4], 1496 bg => [0, 0, 0, 0.4],
1220 force_x => 0, 1497 force_x => 0,
1221 force_y => "max", 1498 force_y => "max",
… …
1248 } 1525 }
1249 }); 1526 });
1250 $MAPWIDGET->show; 1527 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1528 $MAPWIDGET->focus_in;
1252 1529
1253 $LOGVIEW = new CFClient::UI::TextView 1530 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1531 expand => 1,
1255 font => $FONT_FIXED, 1532 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1533 fontsize => $::CFG->{log_fontsize},
1534 indent => -4,
1257 can_hover => 1, 1535 can_hover => 1,
1258 can_events => 1, 1536 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1537 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1538 ;
1261 1539
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1540 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup", 1541 title => "Setup",
1264 name => "setup_dialog", 1542 name => "setup_dialog",
1265 x => 'center', 1543 x => 'center',
1266 y => 'center', 1544 y => 'center',
1545 z => 2,
1267 force_w => $::WIDTH * 0.6, 1546 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6, 1547 force_h => $::HEIGHT * 0.6,
1269 ; 1548 ;
1270 1549
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook); 1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 1552
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options."); 1554 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1555 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1556 "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, 1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1558 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1559 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music."); 1560 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings." 1562 "Lets you define, edit and delete bindings."
1283 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you " 1564 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press Insert and you will be asked to press a key-combo." 1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the " 1566 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes"); 1567 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask.");
1290 1572
1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292 1574
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1575 $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."); 1576 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295 1577
1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1578 $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."); 1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298 1580
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 1581 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 1582
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1583 $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."); 1584 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, 1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305 ."You can also hit the Tab-key to show/hide the Inventory."); 1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306 1588
1307 $BUTTONBAR->add (new CFClient::UI::Button 1589 $BUTTONBAR->add (new CFClient::UI::Button
1308 text => "Save Config", 1590 text => "Save Config",
1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1591 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310 on_activate => sub { 1592 on_activate => sub {
… …
1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313 status "Configuration Saved"; 1595 status "Configuration Saved";
1314 }, 1596 },
1315 ); 1597 );
1316 1598
1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318 tooltip => "View Documentation"); 1600 tooltip => "View Documentation");
1319 1601
1320 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1321 text => "Quit", 1603 text => "Quit",
1322 tooltip => "Terminates the program", 1604 tooltip => "Terminates the program",
… …
1570 map_scale => 1, 1852 map_scale => 1,
1571 fow_enable => 1, 1853 fow_enable => 1,
1572 fow_intensity => 0.45, 1854 fow_intensity => 0.45,
1573 fow_smooth => 0, 1855 fow_smooth => 0,
1574 gui_fontsize => 1, 1856 gui_fontsize => 1,
1575 log_fontsize => 1, 1857 log_fontsize => 0.7,
1576 gauge_fontsize=> 1, 1858 gauge_fontsize=> 1,
1577 gauge_size => 0.35, 1859 gauge_size => 0.35,
1578 stat_fontsize => 1, 1860 stat_fontsize => 0.7,
1579 mapsize => 100, 1861 mapsize => 100,
1580 host => "crossfire.schmorp.de", 1862 host => "crossfire.schmorp.de",
1581 say_command => 'say', 1863 say_command => 'say',
1582 audio_enable => 1, 1864 audio_enable => 1,
1583 bgm_enable => 1, 1865 bgm_enable => 1,
1584 bgm_volume => 0.25, 1866 bgm_volume => 0.25,
1585 face_prefetch => 0, 1867 face_prefetch => 0,
1586 output_sync => 1, 1868 output_sync => 1,
1587 output_count => 1, 1869 output_count => 1,
1870 pickup => 0,
1588 ); 1871 );
1589 1872
1590 while (my ($k, $v) = each %DEF_CFG) { 1873 while (my ($k, $v) = each %DEF_CFG) {
1591 $CFG->{$k} = $v unless exists $CFG->{$k}; 1874 $CFG->{$k} = $v unless exists $CFG->{$k};
1592 } 1875 }

Diff Legend

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