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.58 by root, Mon Jun 5 22:07:43 2006 UTC vs.
Revision 1.71 by elmex, Tue Jun 13 14:35:18 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 44
43$Event::DIED = sub { 45$Event::DIED = sub {
44 # TODO: display dialog box or so 46 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
87 90
88our $SETUP_DIALOG; 91our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 93our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
92our $SETUP_SPELLS; 95our $SETUP_SPELLS;
93 96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
94our $FLOORBOX; 99our $FLOORBOX;
95our $GAUGES; 100our $GAUGES;
96our $STATWIDS; 101our $STATWIDS;
97 102
98our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
119 $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]);
120} 125}
121 126
122sub debug { 127sub debug {
123 $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;
124} 310}
125 311
126sub start_game { 312sub start_game {
127 status "logging in..."; 313 status "logging in...";
128 314
… …
147 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 334 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
150 map => $MAP, 336 map => $MAP,
151 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
152 339
153 sound_play => sub { 340 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
155 342
156 $SDL_MIXER 343 $SDL_MIXER
… …
176sub stop_game { 363sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 366 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
181 369
182 return unless $CONN; 370 return unless $CONN;
183 371
184 status "connection closed"; 372 status "connection closed";
185 373
374 destroy_query_dialog $CONN;
186 $CONN->destroy; 375 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
188} 377}
189 378
190sub graphics_setup { 379sub graphics_setup {
… …
438 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
439 628
440 $win 629 $win
441} 630}
442 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
443 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
444sub make_stats_window { 660sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
447 x => "max", 663 x => "max",
448 title => "Stats", 664 title => "Stats",
449 name => "stats_window"; 665 name => "stats_window";
… …
659 875
660 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
661 877
662 $table->clear; 878 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 892 for 0 .. $#col;
667 893
668 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
669 895
670 my $y = 0; 896 my $y = 0;
671 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) {
… …
688 914
689 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
690 916
691 $y++; 917 $y++;
692 918
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 },
697 }), 927 ),
698 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
699 ]); 929 ]);
700 930
701 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
702 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)
703 for 0 .. $#$m; 939 for 0 .. $#$m;
704 } 940 }
705 } 941 }
706 }); 942 });
707} 943}
708 944
709sub metaserver_dialog { 945sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List", 947 title => "Server List",
712 name => 'metaserver_dialog', 948 name => 'metaserver_dialog',
713 x => 'center', 949 x => 'center',
714 y => 'center', 950 y => 'center',
715 z => 3, 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
… …
971 ["Potions" => PICKUP_POTION], 1220 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => PICKUP_NOT_CURSED], 1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => PICKUP_JEWELS], 1223 ["Jewelery" => PICKUP_JEWELS],
975 ], 1224 ],
1225 ["Weight/Value ratio", 2, 17]
976 ) 1226 )
977 { 1227 {
978 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
979 $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]);
980 1230
… …
985 $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);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1237 state => $CFG->{pickup} & $mask,
988 on_changed => sub { 1238 on_changed => sub {
989 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1240
990 if ($value) { 1241 if ($value) {
991 $::CFG->{pickup} |= $mask; 1242 $::CFG->{pickup} |= $mask;
992 } else { 1243 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1244 $::CFG->{pickup} &= ~$mask;
994 } 1245 }
1246
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
996 if defined $::CONN; 1248 if defined $::CONN;
997 }); 1249 });
998 } 1250 }
999 } 1251 }
1000 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
1001 $table 1272 $table
1002} 1273}
1003 1274
1004sub make_inventory_window { 1275sub inventory_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1277 x => "center",
1007 y => "center", 1278 y => "center",
1008 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
… …
1082 } 1353 }
1083 } 1354 }
1084 }; 1355 };
1085 1356
1086 my $vb = new CFClient::UI::VBox; 1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1360 $hb->add (new CFClient::UI::CheckBox
1361 expand => 1,
1362 state => $CFG->{shift_fire_stop},
1363 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1364 on_changed => sub {
1365 my ($cbox, $value) = @_;
1366 $CFG->{shift_fire_stop} = $value;
1367 });
1368
1087 $vb->add ($binding_list); 1369 $vb->add ($binding_list);
1088 $vb->add (my $hb = new CFClient::UI::HBox); 1370 $vb->add (my $hb = new CFClient::UI::HBox);
1089 1371
1090 $hb->add (new CFClient::UI::Button 1372 $hb->add (new CFClient::UI::Button
1091 text => "record new", 1373 text => "record new",
… …
1122 $refresh->(); 1404 $refresh->();
1123 1405
1124 $vb 1406 $vb
1125} 1407}
1126 1408
1127sub make_help_window { 1409sub help_window {
1128 my $win = new CFClient::UI::FancyFrame 1410 my $win = new CFClient::UI::FancyFrame
1129 x => 'center', 1411 x => 'center',
1130 y => 'center', 1412 y => 'center',
1131 z => 2, 1413 z => 2,
1132 name => 'doc_browser', 1414 name => 'doc_browser',
… …
1135 title => "Documentation"; 1417 title => "Documentation";
1136 1418
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1419 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1420
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1421 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1422 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1423 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1424
1142 for ( 1425 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1426 $buttons->add (my $combo = new CFClient::UI::Combobox
1427 value => undef,
1428 options => [
1143 [intro => "Introduction"], 1429 [intro => "Introduction"],
1144 [manual => "Manual"], 1430 [manual => "Manual"],
1431 [skill_help => "Skills"],
1145 [command_help => "Commands"], 1432 [command_help => "Commands"],
1146 [skill_help => "Skills"], 1433 [dmcommand_help => "DM Commands"],
1147 ) { 1434 [COPYING => "License Terms"],
1148 my ($pod, $label) = @$_; 1435 ],
1436 on_changed => sub {
1437 my ($self, $pod) = @_;
1149 1438
1150 $buttons->add (new CFClient::UI::Button
1151 text => $label,
1152 on_activate => sub {
1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1439 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1440 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1155 1441
1156 $viewer->clear; 1442 $viewer->clear;
1157 1443
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1444 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @$pom; 1445 for @$pom;
1160 1446
1161 $viewer->set_offset (0); 1447 $viewer->set_offset (0);
1162 }, 1448 },
1449 on_visibility_change => sub {
1450 my ($self, $visible) = @_;
1451 return unless $visible;
1452 return if $self->{value};
1453 $self->set_value ("intro");
1454 },
1163 ); 1455 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1456
1168 $win 1457 $win
1169} 1458}
1170 1459
1171sub sdl_init { 1460sub sdl_init {
… …
1227 name => "mapmap", 1516 name => "mapmap",
1228 x => 0, 1517 x => 0,
1229 y => $FONTSIZE + 8, 1518 y => $FONTSIZE + 8,
1230 border_bg => [1, 1, 1, 192/255], 1519 border_bg => [1, 1, 1, 192/255],
1231 bg => [1, 1, 1, 0], 1520 bg => [1, 1, 1, 0],
1521 no_close_button => 1,
1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1522 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1523 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1234 ), 1524 ),
1235 )->show; 1525 )->show;
1236 1526
… …
1248 } 1538 }
1249 }); 1539 });
1250 $MAPWIDGET->show; 1540 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1541 $MAPWIDGET->focus_in;
1252 1542
1253 $LOGVIEW = new CFClient::UI::TextView 1543 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1544 expand => 1,
1255 font => $FONT_FIXED, 1545 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1546 fontsize => $::CFG->{log_fontsize},
1547 indent => -4,
1257 can_hover => 1, 1548 can_hover => 1,
1258 can_events => 1, 1549 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1550 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1551 ;
1261 1552
… …
1268 force_w => $::WIDTH * 0.6, 1559 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6, 1560 force_h => $::HEIGHT * 0.6,
1270 ; 1561 ;
1271 1562
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1563 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1564 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274 1565
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1566 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1567 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1568 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1569 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1578 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the " 1579 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes"); 1580 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1581 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1582 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1583 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1584 "Some debuggign options. Do not ask.");
1292 1585
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1586 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294 1587
1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1588 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1589 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297 1590
1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1591 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1592 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300 1593
1301 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 1594 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
1302 1595
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1597 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1599 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1600 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308 1601
1309 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1310 text => "Save Config", 1603 text => "Save Config",
… …
1314 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1607 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1315 status "Configuration Saved"; 1608 status "Configuration Saved";
1316 }, 1609 },
1317 ); 1610 );
1318 1611
1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1612 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1320 tooltip => "View Documentation"); 1613 tooltip => "View Documentation");
1321 1614
1322 $BUTTONBAR->add (new CFClient::UI::Button 1615 $BUTTONBAR->add (new CFClient::UI::Button
1323 text => "Quit", 1616 text => "Quit",
1324 tooltip => "Terminates the program", 1617 tooltip => "Terminates the program",
… …
1572 map_scale => 1, 1865 map_scale => 1,
1573 fow_enable => 1, 1866 fow_enable => 1,
1574 fow_intensity => 0.45, 1867 fow_intensity => 0.45,
1575 fow_smooth => 0, 1868 fow_smooth => 0,
1576 gui_fontsize => 1, 1869 gui_fontsize => 1,
1577 log_fontsize => 1, 1870 log_fontsize => 0.7,
1578 gauge_fontsize=> 1, 1871 gauge_fontsize=> 1,
1579 gauge_size => 0.35, 1872 gauge_size => 0.35,
1580 stat_fontsize => 1, 1873 stat_fontsize => 0.7,
1581 mapsize => 100, 1874 mapsize => 100,
1582 host => "crossfire.schmorp.de", 1875 host => "crossfire.schmorp.de",
1583 say_command => 'say', 1876 say_command => 'say',
1584 audio_enable => 1, 1877 audio_enable => 1,
1585 bgm_enable => 1, 1878 bgm_enable => 1,
1586 bgm_volume => 0.25, 1879 bgm_volume => 0.25,
1587 face_prefetch => 0, 1880 face_prefetch => 0,
1588 output_sync => 1, 1881 output_sync => 1,
1589 output_count => 1, 1882 output_count => 1,
1883 pickup => 0,
1590 ); 1884 );
1591 1885
1592 while (my ($k, $v) = each %DEF_CFG) { 1886 while (my ($k, $v) = each %DEF_CFG) {
1593 $CFG->{$k} = $v unless exists $CFG->{$k}; 1887 $CFG->{$k} = $v unless exists $CFG->{$k};
1594 } 1888 }
… …
1641 video_init; 1935 video_init;
1642 audio_init; 1936 audio_init;
1643} 1937}
1644 1938
1645Event::loop; 1939Event::loop;
1940#CFClient::SDL_Quit;
1941#CFClient::_exit 0;
1646 1942
1647END { CFClient::SDL_Quit } 1943END { CFClient::SDL_Quit }
1648 1944
1649=head1 NAME 1945=head1 NAME
1650 1946

Diff Legend

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