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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.68 by elmex, Mon Jun 12 12:28:06 2006 UTC

… …
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
89 90
90our $SETUP_DIALOG; 91our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 93our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
94our $SETUP_SPELLS; 95our $SETUP_SPELLS;
95 96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
96our $FLOORBOX; 99our $FLOORBOX;
97our $GAUGES; 100our $GAUGES;
98our $STATWIDS; 101our $STATWIDS;
99 102
100our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
121 $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]);
122} 125}
123 126
124sub debug { 127sub debug {
125 $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;
126} 310}
127 311
128sub start_game { 312sub start_game {
129 status "logging in..."; 313 status "logging in...";
130 314
… …
149 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW, 334 logview => $LOGVIEW,
151 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
152 map => $MAP, 336 map => $MAP,
153 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
154 339
155 sound_play => sub { 340 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
157 342
158 $SDL_MIXER 343 $SDL_MIXER
… …
178sub stop_game { 363sub stop_game {
179 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show; 366 $SETUP_DIALOG->show;
182 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
183 369
184 return unless $CONN; 370 return unless $CONN;
185 371
186 status "connection closed"; 372 status "connection closed";
187 373
374 destroy_query_dialog $CONN;
188 $CONN->destroy; 375 $CONN->destroy;
189 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
190} 377}
191 378
192sub graphics_setup { 379sub graphics_setup {
… …
440 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
441 628
442 $win 629 $win
443} 630}
444 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
445 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
446sub make_stats_window { 660sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
449 x => "max", 663 x => "max",
450 title => "Stats", 664 title => "Stats",
451 name => "stats_window"; 665 name => "stats_window";
… …
661 875
662 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
663 877
664 $table->clear; 878 $table->clear;
665 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 );
666 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
667 $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[$_])
668 for 0 .. $#col; 892 for 0 .. $#col;
669 893
670 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
671 895
672 my $y = 0; 896 my $y = 0;
673 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) {
… …
690 914
691 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
692 916
693 $y++; 917 $y++;
694 918
695 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
696 (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 {
697 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 },
699 }), 927 ),
700 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
701 ]); 929 ]);
702 930
703 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
704 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)
705 for 0 .. $#$m; 939 for 0 .. $#$m;
706 } 940 }
707 } 941 }
708 }); 942 });
709} 943}
710 944
711sub metaserver_dialog { 945sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List", 947 title => "Server List",
714 name => 'metaserver_dialog', 948 name => 'metaserver_dialog',
715 x => 'center', 949 x => 'center',
716 y => 'center', 950 y => 'center',
717 z => 3, 951 z => 3,
952 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 954 on_visibility_change => sub {
720 update_metaserver if $_[1]; 955 update_metaserver if $_[1];
721 }, 956 },
722 ; 957 ;
723 958
724 $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});
725 962
726 $dialog 963 $dialog
727} 964}
728 965
729sub server_setup { 966sub server_setup {
… …
752 expand => 1, 989 expand => 1,
753 text => "Server List", 990 text => "Server List",
754 other => $METASERVER, 991 other => $METASERVER,
755 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
756 on_activate => sub { $METASERVER->toggle_visibility }, 993 on_activate => sub { $METASERVER->toggle_visibility },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
757 ); 995 );
758 } 996 }
759 997
760 $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");
761 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
840 my ($self, $value) = @_; 1078 my ($self, $value) = @_;
841 $CFG->{say_command} = $value; 1079 $CFG->{say_command} = $value;
842 } 1080 }
843 ); 1081 );
844 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
845 $vbox 1092 $vbox
846} 1093}
847 1094
848sub message_window { 1095sub message_window {
849 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
… …
851 title => "Messages", 1098 title => "Messages",
852 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
853 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
854 x => "max", 1101 x => "max",
855 y => 0, 1102 y => 0,
856 force_w => $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
857 force_h => $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
858 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
859 1106
860 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
861 1108
862 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
973 ["Potions" => PICKUP_POTION], 1220 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED], 1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS], 1223 ["Jewelery" => PICKUP_JEWELS],
977 ], 1224 ],
1225 ["Weight/Value ratio", 2, 17]
978 ) 1226 )
979 { 1227 {
980 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
981 $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]);
982 1230
… …
987 $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);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1237 state => $CFG->{pickup} & $mask,
990 on_changed => sub { 1238 on_changed => sub {
991 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1240
992 if ($value) { 1241 if ($value) {
993 $::CFG->{pickup} |= $mask; 1242 $::CFG->{pickup} |= $mask;
994 } else { 1243 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1244 $::CFG->{pickup} &= ~$mask;
996 } 1245 }
1246
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1248 if defined $::CONN;
999 }); 1249 });
1000 } 1250 }
1001 } 1251 }
1002 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
1003 $table 1272 $table
1004} 1273}
1005 1274
1006sub make_inventory_window { 1275sub inventory_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1277 x => "center",
1009 y => "center", 1278 y => "center",
1010 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
… …
1124 $refresh->(); 1393 $refresh->();
1125 1394
1126 $vb 1395 $vb
1127} 1396}
1128 1397
1129sub make_help_window { 1398sub help_window {
1130 my $win = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
1131 x => 'center', 1400 x => 'center',
1132 y => 'center', 1401 y => 'center',
1133 z => 2, 1402 z => 2,
1134 name => 'doc_browser', 1403 name => 'doc_browser',
… …
1137 title => "Documentation"; 1406 title => "Documentation";
1138 1407
1139 $win->add (my $vbox = new CFClient::UI::VBox); 1408 $win->add (my $vbox = new CFClient::UI::VBox);
1140 1409
1141 $vbox->add (my $buttons = new CFClient::UI::HBox); 1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
1142 $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);
1143 1413
1144 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 => [
1145 [intro => "Introduction"], 1418 [intro => "Introduction"],
1146 [manual => "Manual"], 1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
1147 [command_help => "Commands"], 1421 [command_help => "Commands"],
1148 [skill_help => "Skills"], 1422 [dmcommand_help => "DM Commands"],
1149 ) { 1423 [COPYING => "License Terms"],
1150 my ($pod, $label) = @$_; 1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1151 1427
1152 $buttons->add (new CFClient::UI::Button
1153 text => $label,
1154 on_activate => sub {
1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1157 1430
1158 $viewer->clear; 1431 $viewer->clear;
1159 1432
1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1161 for @$pom; 1434 for @$pom;
1162 1435
1163 $viewer->set_offset (0); 1436 $viewer->set_offset (0);
1164 }, 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 },
1165 ); 1444 );
1166 }
1167
1168 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1169 1445
1170 $win 1446 $win
1171} 1447}
1172 1448
1173sub sdl_init { 1449sub sdl_init {
… …
1250 } 1526 }
1251 }); 1527 });
1252 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1253 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1254 1530
1255 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1256 expand => 1, 1532 expand => 1,
1257 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1258 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1259 can_hover => 1, 1536 can_hover => 1,
1260 can_events => 1, 1537 can_events => 1,
1261 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.",
1262 ; 1539 ;
1263 1540
… …
1270 force_w => $::WIDTH * 0.6, 1547 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6, 1548 force_h => $::HEIGHT * 0.6,
1272 ; 1549 ;
1273 1550
1274 $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,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 1553
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "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.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1289 . "want to record press <b>Insert</b> 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. "
1290 . "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 "
1291 . "binding editor closes"); 1568 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "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.");
1294 1573
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296 1575
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1298 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.");
1299 1578
1300 $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,
1301 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.");
1302 1581
1303 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
1304 1583
1305 $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,
1306 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.");
1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1586 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1308 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 :). "
1309 . "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.");
1310 1589
1311 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1312 text => "Save Config", 1591 text => "Save Config",
… …
1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1317 status "Configuration Saved"; 1596 status "Configuration Saved";
1318 }, 1597 },
1319 ); 1598 );
1320 1599
1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1322 tooltip => "View Documentation"); 1601 tooltip => "View Documentation");
1323 1602
1324 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1325 text => "Quit", 1604 text => "Quit",
1326 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
… …
1574 map_scale => 1, 1853 map_scale => 1,
1575 fow_enable => 1, 1854 fow_enable => 1,
1576 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1577 fow_smooth => 0, 1856 fow_smooth => 0,
1578 gui_fontsize => 1, 1857 gui_fontsize => 1,
1579 log_fontsize => 1, 1858 log_fontsize => 0.7,
1580 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1581 gauge_size => 0.35, 1860 gauge_size => 0.35,
1582 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1583 mapsize => 100, 1862 mapsize => 100,
1584 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1585 say_command => 'say', 1864 say_command => 'say',
1586 audio_enable => 1, 1865 audio_enable => 1,
1587 bgm_enable => 1, 1866 bgm_enable => 1,
1588 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1589 face_prefetch => 0, 1868 face_prefetch => 0,
1590 output_sync => 1, 1869 output_sync => 1,
1591 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1592 ); 1872 );
1593 1873
1594 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1595 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1596 } 1876 }

Diff Legend

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