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.68 by elmex, Mon Jun 12 12:28:06 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; 368 $SETUP_SPELLS->clear_spells;
182 369
183 return unless $CONN; 370 return unless $CONN;
184 371
185 status "connection closed"; 372 status "connection closed";
186 373
374 destroy_query_dialog $CONN;
187 $CONN->destroy; 375 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
189} 377}
190 378
191sub graphics_setup { 379sub graphics_setup {
… …
439 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
440 628
441 $win 629 $win
442} 630}
443 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
444 634
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
643
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645
646 for my $x (0..2) {
647 for my $y (0 .. 2) {
648 $table->add ($x + 3, $y,
649 new CFClient::UI::Entry
650 text => $default_smooth[$x * 3 + $y],
651 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652 );
653 }
654 }
655
656
657 $table
658}
659
445sub make_stats_window { 660sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
448 x => "max", 663 x => "max",
449 title => "Stats", 664 title => "Stats",
450 name => "stats_window"; 665 name => "stats_window";
… …
660 875
661 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
662 877
663 $table->clear; 878 $table->clear;
664 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
665 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 892 for 0 .. $#col;
668 893
669 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
670 895
671 my $y = 0; 896 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 914
690 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
691 916
692 $y++; 917 $y++;
693 918
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 },
698 }), 927 ),
699 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
700 ]); 929 ]);
701 930
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 932 ellipsise => 0,
933 align => $align[$_],
934 text => $m->[$_],
935 tooltip => $tip[$_],
936 can_hover => 1,
937 can_events => 1,
938 fontsize => 0.8)
704 for 0 .. $#$m; 939 for 0 .. $#$m;
705 } 940 }
706 } 941 }
707 }); 942 });
708} 943}
709 944
710sub metaserver_dialog { 945sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 947 title => "Server List",
713 name => 'metaserver_dialog', 948 name => 'metaserver_dialog',
714 x => 'center', 949 x => 'center',
715 y => 'center', 950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 954 on_visibility_change => sub {
718 update_metaserver if $_[1]; 955 update_metaserver if $_[1];
719 }, 956 },
720 ; 957 ;
721 958
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 962
724 $dialog 963 $dialog
725} 964}
726 965
727sub server_setup { 966sub server_setup {
… …
750 expand => 1, 989 expand => 1,
751 text => "Server List", 990 text => "Server List",
752 other => $METASERVER, 991 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 993 on_activate => sub { $METASERVER->toggle_visibility },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 ); 995 );
756 } 996 }
757 997
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
838 my ($self, $value) = @_; 1078 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1079 $CFG->{say_command} = $value;
840 } 1080 }
841 ); 1081 );
842 1082
1083 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info",
1085 fontsize => 1.2,
1086 padding_y => 8,
1087 fg => [1, 1, 0, 1],
1088 );
1089
1090 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1091
843 $vbox 1092 $vbox
844} 1093}
845 1094
846sub message_window { 1095sub message_window {
847 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
… …
849 title => "Messages", 1098 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
852 x => "max", 1101 x => "max",
853 y => 0, 1102 y => 0,
854 force_w => $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
857 1106
858 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
859 1108
860 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
903sub open_quit_dialog { 1152sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1155 x => "center",
907 y => "center", 1156 y => "center",
1157 z => 50,
908 title => "Really Quit?", 1158 title => "Really Quit?",
909 ; 1159 ;
910 1160
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1162
… …
934sub autopickup_setup { 1184sub autopickup_setup {
935 my $table = new CFClient::UI::Table; 1185 my $table = new CFClient::UI::Table;
936 1186
937 for ( 1187 for (
938 ["General", 0, 0, 1188 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1189 ["Enable autopickup" => PICKUP_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1191 ["Stop before pickup" => PICKUP_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1192 ["Debug autopickup" => PICKUP_DEBUG],
943 ], 1193 ],
944 ["Weapons", 0, 6, 1194 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1195 ["All weapons" => PICKUP_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW], 1197 ["Bows" => PICKUP_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW], 1198 ["Arrows" => PICKUP_ARROW],
949 ], 1199 ],
950 ["Armour", 0, 12, 1200 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET], 1201 ["Helmets" => PICKUP_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD], 1202 ["Shields" => PICKUP_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1203 ["Body Armour" => PICKUP_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS], 1204 ["Boots" => PICKUP_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1205 ["Gloves" => PICKUP_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1206 ["Cloaks" => PICKUP_CLOAK],
957 ], 1207 ],
958 1208
959 ["Readables", 2, 2, 1209 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1210 ["Spellbooks" => PICKUP_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
963 ], 1213 ],
964 ["Misc", 2, 7, 1214 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD], 1215 ["Food" => PICKUP_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK], 1216 ["Drinks" => PICKUP_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY], 1218 ["Keys" => PICKUP_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1219 ["Magical Items" => PICKUP_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION], 1220 ["Potions" => PICKUP_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1223 ["Jewelery" => PICKUP_JEWELS],
974 ], 1224 ],
1225 ["Weight/Value ratio", 2, 17]
975 ) 1226 )
976 { 1227 {
977 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979 1230
… …
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask, 1237 state => $CFG->{pickup} & $mask,
987 on_changed => sub { 1238 on_changed => sub {
988 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1240
989 if ($value) { 1241 if ($value) {
990 $::CFG->{pickup} |= $mask; 1242 $::CFG->{pickup} |= $mask;
991 } else { 1243 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1244 $::CFG->{pickup} &= ~$mask;
993 } 1245 }
1246
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
995 if defined $::CONN; 1248 if defined $::CONN;
996 }); 1249 });
997 } 1250 }
998 } 1251 }
999 1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 1;
1270 });
1271
1000 $table 1272 $table
1001} 1273}
1002 1274
1003sub make_inventory_window { 1275sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1277 x => "center",
1006 y => "center", 1278 y => "center",
1007 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
… …
1100 $SETUP_DIALOG->show; 1372 $SETUP_DIALOG->show;
1101 }, 1373 },
1102 sub { 1374 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show; 1376 $SETUP_DIALOG->show;
1105 }); 1377 },
1378 );
1106 $SETUP_DIALOG->hide; 1379 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show; 1380 $::BIND_EDITOR->show;
1108 }, 1381 },
1109 ); 1382 );
1110 1383
… …
1120 $refresh->(); 1393 $refresh->();
1121 1394
1122 $vb 1395 $vb
1123} 1396}
1124 1397
1125sub make_help_window { 1398sub help_window {
1126 my $win = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
1127 x => 'center', 1400 x => 'center',
1128 y => 'center', 1401 y => 'center',
1402 z => 2,
1129 name => 'doc_browser', 1403 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8, 1404 force_w => int $WIDTH * 7/8,
1131 force_h => int $HEIGHT * 7/8, 1405 force_h => int $HEIGHT * 7/8,
1132 title => "Documentation"; 1406 title => "Documentation";
1133 1407
1134 $win->add (my $vbox = new CFClient::UI::VBox); 1408 $win->add (my $vbox = new CFClient::UI::VBox);
1135 1409
1136 $vbox->add (my $buttons = new CFClient::UI::HBox); 1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
1137 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4);
1138 1413
1139 for ( 1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox
1416 value => undef,
1417 options => [
1140 [intro => "Introduction"], 1418 [intro => "Introduction"],
1141 [manual => "Manual"], 1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
1142 [command_help => "Commands"], 1421 [command_help => "Commands"],
1143 [skill_help => "Skills"], 1422 [dmcommand_help => "DM Commands"],
1144 ) { 1423 [COPYING => "License Terms"],
1145 my ($pod, $label) = @$_; 1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1146 1427
1147 $buttons->add (new CFClient::UI::Button 1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1148 text => $label, 1429 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 1430
1153 $viewer->clear; 1431 $viewer->clear;
1154 1432
1155 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1156 for @{ CFClient::pod_to_pango_list $pom }; 1434 for @$pom;
1157 1435
1158 $viewer->set_offset (0); 1436 $viewer->set_offset (0);
1159 }, 1437 },
1438 on_visibility_change => sub {
1439 my ($self, $visible) = @_;
1440 return unless $visible;
1441 return if $self->{value};
1442 $self->set_value ("intro");
1443 },
1160 ); 1444 );
1161 }
1162
1163 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1164 1445
1165 $win 1446 $win
1166} 1447}
1167 1448
1168sub sdl_init { 1449sub sdl_init {
… …
1208 $DEBUG_STATUS->show; 1489 $DEBUG_STATUS->show;
1209 1490
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211 1492
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1493 $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]); 1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1214 1495
1215 (new CFClient::UI::Frame 1496 (new CFClient::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1497 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1498 force_x => 0,
1218 force_y => "max", 1499 force_y => "max",
… …
1245 } 1526 }
1246 }); 1527 });
1247 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1248 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1249 1530
1250 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1251 expand => 1, 1532 expand => 1,
1252 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1253 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1254 can_hover => 1, 1536 can_hover => 1,
1255 can_events => 1, 1537 can_events => 1,
1256 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1257 ; 1539 ;
1258 1540
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1260 title => "Setup", 1542 title => "Setup",
1261 name => "setup_dialog", 1543 name => "setup_dialog",
1262 x => 'center', 1544 x => 'center',
1263 y => 'center', 1545 y => 'center',
1546 z => 2,
1264 force_w => $::WIDTH * 0.6, 1547 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1548 force_h => $::HEIGHT * 0.6,
1266 ; 1549 ;
1267 1550
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1551 $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); 1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1270 1553
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "Configure the server to play on, your username, password and other server-related options."); 1555 "Configure the server to play on, your username, password and other server-related options.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1557 "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, 1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1559 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1560 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1561 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1563 "Lets you define, edit and delete bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1564 . "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 " 1565 . "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." 1566 . "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 " 1567 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1568 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask.");
1288 1573
1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1290 1575
1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1576 $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."); 1577 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1293 1578
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1579 $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."); 1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1296 1581
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 1582 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 1583
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1584 $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."); 1585 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, 1586 $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 :). " 1587 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."); 1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1589
1305 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1306 text => "Save Config", 1591 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.", 1592 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 { 1593 on_activate => sub {
… …
1310 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1311 status "Configuration Saved"; 1596 status "Configuration Saved";
1312 }, 1597 },
1313 ); 1598 );
1314 1599
1315 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1316 tooltip => "View Documentation"); 1601 tooltip => "View Documentation");
1317 1602
1318 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1319 text => "Quit", 1604 text => "Quit",
1320 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
… …
1568 map_scale => 1, 1853 map_scale => 1,
1569 fow_enable => 1, 1854 fow_enable => 1,
1570 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1571 fow_smooth => 0, 1856 fow_smooth => 0,
1572 gui_fontsize => 1, 1857 gui_fontsize => 1,
1573 log_fontsize => 1, 1858 log_fontsize => 0.7,
1574 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1575 gauge_size => 0.35, 1860 gauge_size => 0.35,
1576 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1577 mapsize => 100, 1862 mapsize => 100,
1578 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1579 say_command => 'say', 1864 say_command => 'say',
1580 audio_enable => 1, 1865 audio_enable => 1,
1581 bgm_enable => 1, 1866 bgm_enable => 1,
1582 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1583 face_prefetch => 0, 1868 face_prefetch => 0,
1584 output_sync => 1, 1869 output_sync => 1,
1585 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1586 ); 1872 );
1587 1873
1588 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1589 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1590 } 1876 }

Diff Legend

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