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.47 by root, Fri Jun 2 21:36:12 2006 UTC vs.
Revision 1.71 by elmex, Tue Jun 13 14:35:18 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
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
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;
87our $SERVER_SETUP; 89our $SERVER_INFO;
88 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
89our $FLOORBOX; 99our $FLOORBOX;
90our $GAUGES; 100our $GAUGES;
91our $STATWIDS; 101our $STATWIDS;
92 102
93our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 114our $INV_WINDOW;
105our $INV; 115our $INV;
106our $INVR; 116our $INVR;
107our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
108 118
109our $BIND_WINDOW;
110our $BIND_EDITOR; 119our $BIND_EDITOR;
111 120
112our $SPELL_LIST;
113our $PICKUP_CFG; 121our $PICKUP_CFG;
114 122
115sub status { 123sub status {
116 $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]);
117} 125}
118 126
119sub debug { 127sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
121} 129}
122 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;
310}
311
123sub start_game { 312sub start_game {
124 status "logging in..."; 313 status "logging in...";
125 314
126 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
128 317
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 319
131 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
132 321
… …
144 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 334 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
147 map => $MAP, 336 map => $MAP,
148 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
149 339
150 sound_play => sub { 340 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
152 342
153 $SDL_MIXER 343 $SDL_MIXER
… …
170 } 360 }
171} 361}
172 362
173sub stop_game { 363sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
177 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
178 369
179 return unless $CONN; 370 return unless $CONN;
180 371
181 status "connection closed"; 372 status "connection closed";
182 373
374 destroy_query_dialog $CONN;
183 $CONN->destroy; 375 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
185} 377}
186 378
187sub client_setup { 379sub graphics_setup {
188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
194 381
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 382 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 383
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 384 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 509 on_activate => sub {
323 video_shutdown (); 510 video_shutdown ();
324 video_init (); 511 video_init ();
325 } 512 }
326 ); 513 );
514
515 $vbox
516}
517
518sub audio_setup {
519 my $vbox = new CFClient::UI::VBox;
520
521 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
522
523 my $row = 0;
327 524
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
331 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 528 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
362 audio_shutdown (); 559 audio_shutdown ();
363 audio_init (); 560 audio_init ();
364 } 561 }
365 ); 562 );
366 563
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380} 565}
381 566
382sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
442 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
443 628
444 $win 629 $win
445} 630}
446 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
447 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
448sub make_stats_window { 660sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
451 x => "max", 663 x => "max",
452 title => "Stats", 664 title => "Stats",
453 name => "stats_window"; 665 name => "stats_window";
… …
557 update_stats_window ({}); 769 update_stats_window ({});
558 770
559 $tgw 771 $tgw
560} 772}
561 773
562sub formsep { 774sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 776}
565 777
566sub update_stats_window { 778sub update_stats_window {
567 my ($stats) = @_; 779 my ($stats) = @_;
568 780
… …
663 875
664 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
665 877
666 $table->clear; 878 $table->clear;
667 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 );
668 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
669 $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[$_])
670 for 0 .. $#col; 892 for 0 .. $#col;
671 893
672 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
673 895
674 my $y = 0; 896 my $y = 0;
675 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) {
… …
692 914
693 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
694 916
695 $y++; 917 $y++;
696 918
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (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 {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 },
701 }), 927 ),
702 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
703 ]); 929 ]);
704 930
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
706 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)
707 for 0 .. $#$m; 939 for 0 .. $#$m;
708 } 940 }
709 } 941 }
710 }); 942 });
711} 943}
712 944
713sub metaserver_dialog { 945sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 947 title => "Server List",
716 name => 'metaserver_dialog', 948 name => 'metaserver_dialog',
717 x => 'center', 949 x => 'center',
718 y => 'center', 950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
719 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 954 on_visibility_change => sub {
721 update_metaserver if $_[1]; 955 update_metaserver if $_[1];
722 }, 956 },
723 ; 957 ;
724 958
725 $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});
726 962
727 $dialog 963 $dialog
728} 964}
729 965
730sub server_setup { 966sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 967 my $vbox = new CFClient::UI::VBox;
737 ;
738 968
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 971
742 { 972 {
… …
759 expand => 1, 989 expand => 1,
760 text => "Server List", 990 text => "Server List",
761 other => $METASERVER, 991 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 993 on_activate => sub { $METASERVER->toggle_visibility },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
764 ); 995 );
765 } 996 }
766 997
767 $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");
768 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
835 $CONN ? stop_game 1066 $CONN ? stop_game
836 : start_game; 1067 : start_game;
837 }, 1068 },
838 ); 1069 );
839 1070
840 $dialog 1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 text => $CFG->{say_command},
1074 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub {
1078 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value;
1080 }
1081 );
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
1092 $vbox
841} 1093}
842 1094
843sub message_window { 1095sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1097 name => "message_window",
846 title => "Messages", 1098 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
849 x => "max", 1101 x => "max",
850 y => 0, 1102 y => 0,
851 force_w => $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
854 1106
855 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
856 1108
857 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
900sub open_quit_dialog { 1152sub open_quit_dialog {
901 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
902 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center", 1155 x => "center",
904 y => "center", 1156 y => "center",
1157 z => 50,
905 title => "Really Quit?", 1158 title => "Really Quit?",
906 ; 1159 ;
907 1160
908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
909 1162
… …
926 } 1179 }
927 1180
928 $QUIT_DIALOG->show; 1181 $QUIT_DIALOG->show;
929} 1182}
930 1183
931sub make_pickup_cfg_window { 1184sub autopickup_setup {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame 1185 my $table = new CFClient::UI::Table;
933 title => "Autopickup configuration",
934 x => "center",
935 y => "center",
936 force_w => $WIDTH * 6/10,
937 force_h => $HEIGHT * 9/10;
938
939
940 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
941 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
942 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
943 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
944 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
945
946 my $tbl = 0;
947 my $tblrow = 0;
948 1186
949 for ( 1187 for (
950 ["General", $gen_tbl], 1188 ["General", 0, 0,
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1189 ["Enable autopickup" => PICKUP_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1191 ["Stop before pickup" => PICKUP_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1192 ["Debug autopickup" => PICKUP_DEBUG],
1193 ],
955 ["Weapons", $ltbl], 1194 ["Weapons", 0, 6,
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1195 ["All weapons" => PICKUP_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW], 1197 ["Bows" => PICKUP_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW], 1198 ["Arrows" => PICKUP_ARROW],
1199 ],
960 ["Armour"], 1200 ["Armour", 0, 12,
961 ["Helmets" => CFClient::Pickup::PU_HELMET], 1201 ["Helmets" => PICKUP_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD], 1202 ["Shields" => PICKUP_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1203 ["Body Armour" => PICKUP_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS], 1204 ["Boots" => PICKUP_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1205 ["Gloves" => PICKUP_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1206 ["Cloaks" => PICKUP_CLOAK],
1207 ],
1208
967 ["Readables", $rtbl], 1209 ["Readables", 2, 2,
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1210 ["Spellbooks" => PICKUP_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ],
971 ["Misc"], 1214 ["Misc", 2, 7,
972 ["Food" => CFClient::Pickup::PU_FOOD], 1215 ["Food" => PICKUP_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK], 1216 ["Drinks" => PICKUP_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY], 1218 ["Keys" => PICKUP_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1219 ["Magical Items" => PICKUP_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION], 1220 ["Potions" => PICKUP_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1223 ["Jewelery" => PICKUP_JEWELS],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
981 ) 1226 )
982 { 1227 {
983 if (ref $_->[1]) { 1228 my ($title, $x, $y, @bits) = @$_;
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
987 } elsif (not defined $_->[1]) { 1230
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1231 for (@bits) {
989 } else { 1232 ++$y;
1233
990 my $mask = $_->[1]; 1234 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, 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);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask, 1237 state => $CFG->{pickup} & $mask,
994 on_changed => sub { 1238 on_changed => sub {
995 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1240
996 if ($value) { 1241 if ($value) {
997 $::CFG->{pickup} |= $mask; 1242 $::CFG->{pickup} |= $mask;
998 } else { 1243 } else {
999 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1244 $::CFG->{pickup} &= ~$mask;
1000 } 1245 }
1246
1001 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1002 if defined $::CONN; 1248 if defined $::CONN;
1003 }); 1249 });
1004 } 1250 }
1005 } 1251 }
1006 1252
1007 $PICKUP_CFG 1253 $table->add (2, 18, new CFClient::UI::ValSlider
1008} 1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1009 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
1272 $table
1273}
1274
1010sub make_inventory_window { 1275sub inventory_window {
1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center", 1277 x => "center",
1013 y => "center", 1278 y => "center",
1014 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
1015 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
… …
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033 1298
1034 $invwin 1299 $invwin
1035} 1300}
1036 1301
1037sub make_spell_list { 1302sub spell_setup {
1038 $SPELL_LIST = new CFClient::UI::SpellList 1303 new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
1042} 1304}
1043 1305
1044sub make_binding_window { 1306sub keyboard_setup {
1045 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
1046 1308
1047 my $refresh; 1309 my $refresh;
1048 $refresh = sub { 1310 $refresh = sub {
1049 $binding_list->clear (); 1311 $binding_list->clear ();
… …
1073 sub { 1335 sub {
1074 my ($nmod, $nsym, $ncmds) = @_; 1336 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym}; 1337 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->(); 1339 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1078 $::BIND_WINDOW->show; 1341 $SETUP_DIALOG->show;
1079 }, 1342 },
1080 sub { 1343 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1081 $::BIND_WINDOW->show; 1345 $SETUP_DIALOG->show;
1082 }); 1346 });
1083 $::BIND_EDITOR->show; 1347 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide; 1348 $SETUP_DIALOG->hide;
1085 }); 1349 });
1086 1350
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 } 1353 }
1090 } 1354 }
1091 }; 1355 };
1092 1356
1093 $BIND_WINDOW = new CFClient::UI::FancyFrame 1357 my $vb = new CFClient::UI::VBox;
1094 title => "Bindings",
1095 x => "center",
1096 y => "center",
1097 def_w => int $WIDTH * 9/10,
1098 def_h => int $HEIGHT * 9/10,
1099 on_visibility_change => sub {
1100 my ($self, $visible) = @_;
1101 $refresh->() if $visible;
1102 };
1103
1104 $BIND_WINDOW->add (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
1105 $vb->add ($binding_list); 1369 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox); 1370 $vb->add (my $hb = new CFClient::UI::HBox);
1371
1107 $hb->add (new CFClient::UI::Button 1372 $hb->add (new CFClient::UI::Button
1108 text => "record new", 1373 text => "record new",
1109 expand => 1, 1374 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.", 1375 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub { 1376 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [], 1377 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub { 1378 sub {
1114 my ($mod, $sym, $cmds) = @_; 1379 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1380 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->(); 1381 $refresh->();
1117 $::BIND_WINDOW->show; 1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1383 $SETUP_DIALOG->show;
1118 }, 1384 },
1119 sub { 1385 sub {
1120 $::BIND_WINDOW->show; 1386 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1387 $SETUP_DIALOG->show;
1121 }); 1388 },
1122 $::BIND_WINDOW->hide; 1389 );
1390 $SETUP_DIALOG->hide;
1123 $::BIND_EDITOR->show; 1391 $::BIND_EDITOR->show;
1124 }, 1392 },
1125 ); 1393 );
1394
1126 $hb->add (new CFClient::UI::Button 1395 $hb->add (new CFClient::UI::Button
1127 text => "close", 1396 text => "close",
1128 tooltip => "Closes the binding window", 1397 tooltip => "Closes the binding window",
1129 expand => 1, 1398 expand => 1,
1130 on_activate => sub { 1399 on_activate => sub {
1131 $::BIND_WINDOW->hide; 1400 $SETUP_DIALOG->hide;
1132 } 1401 }
1133 ); 1402 );
1134 1403
1135 $refresh->(); 1404 $refresh->();
1136 $BIND_WINDOW
1137}
1138 1405
1406 $vb
1407}
1408
1139sub make_help_window { 1409sub help_window {
1140 my $win = new CFClient::UI::FancyFrame 1410 my $win = new CFClient::UI::FancyFrame
1141 x => 'center', 1411 x => 'center',
1142 y => 'center', 1412 y => 'center',
1413 z => 2,
1143 name => 'doc_browser', 1414 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8, 1415 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8, 1416 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation"; 1417 title => "Documentation";
1147 1418
1148 $win->add (my $vbox = new CFClient::UI::VBox); 1419 $win->add (my $vbox = new CFClient::UI::VBox);
1149 1420
1150 $vbox->add (my $buttons = new CFClient::UI::HBox); 1421 $vbox->add (my $buttons = new CFClient::UI::HBox);
1151 $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);
1152 1424
1153 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 => [
1154 [intro => "Introduction"], 1429 [intro => "Introduction"],
1155 [manual => "Manual"], 1430 [manual => "Manual"],
1431 [skill_help => "Skills"],
1156 [command_help => "Commands"], 1432 [command_help => "Commands"],
1157 [skill_help => "Skills"], 1433 [dmcommand_help => "DM Commands"],
1158 ) { 1434 [COPYING => "License Terms"],
1159 my ($pod, $label) = @$_; 1435 ],
1436 on_changed => sub {
1437 my ($self, $pod) = @_;
1160 1438
1161 $buttons->add (new CFClient::UI::Button 1439 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1162 text => $label, 1440 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1163 on_activate => sub {
1164 my $parser = new Pod::POM;
1165 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1166 1441
1167 $viewer->clear; 1442 $viewer->clear;
1168 1443
1169 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1444 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1170 for @{ CFClient::pod_to_pango_list $pom }; 1445 for @$pom;
1171 1446
1172 $viewer->set_offset (0); 1447 $viewer->set_offset (0);
1173 }, 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 },
1174 ); 1455 );
1175 }
1176
1177 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1178 1456
1179 $win 1457 $win
1180} 1458}
1181 1459
1182sub sdl_init { 1460sub sdl_init {
… …
1222 $DEBUG_STATUS->show; 1500 $DEBUG_STATUS->show;
1223 1501
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1502 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225 1503
1226 $STATUSBOX = new CFClient::UI::Statusbox; 1504 $STATUSBOX = new CFClient::UI::Statusbox;
1227 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1505 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1228 1506
1229 (new CFClient::UI::Frame 1507 (new CFClient::UI::Frame
1230 bg => [0, 0, 0, 0.4], 1508 bg => [0, 0, 0, 0.4],
1231 force_x => 0, 1509 force_x => 0,
1232 force_y => "max", 1510 force_y => "max",
… …
1238 name => "mapmap", 1516 name => "mapmap",
1239 x => 0, 1517 x => 0,
1240 y => $FONTSIZE + 8, 1518 y => $FONTSIZE + 8,
1241 border_bg => [1, 1, 1, 192/255], 1519 border_bg => [1, 1, 1, 192/255],
1242 bg => [1, 1, 1, 0], 1520 bg => [1, 1, 1, 0],
1521 no_close_button => 1,
1243 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1522 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1244 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.",
1245 ), 1524 ),
1246 )->show; 1525 )->show;
1247 1526
… …
1259 } 1538 }
1260 }); 1539 });
1261 $MAPWIDGET->show; 1540 $MAPWIDGET->show;
1262 $MAPWIDGET->focus_in; 1541 $MAPWIDGET->focus_in;
1263 1542
1264 $LOGVIEW = new CFClient::UI::TextView 1543 $LOGVIEW = new CFClient::UI::TextScroller
1265 expand => 1, 1544 expand => 1,
1266 font => $FONT_FIXED, 1545 font => $FONT_FIXED,
1267 fontsize => $::CFG->{log_fontsize}, 1546 fontsize => $::CFG->{log_fontsize},
1547 indent => -4,
1268 can_hover => 1, 1548 can_hover => 1,
1269 can_events => 1, 1549 can_events => 1,
1270 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.",
1271 ; 1551 ;
1272 1552
1553 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1554 title => "Setup",
1555 name => "setup_dialog",
1556 x => 'center',
1557 y => 'center',
1558 z => 2,
1559 force_w => $::WIDTH * 0.6,
1560 force_h => $::HEIGHT * 0.6,
1561 ;
1562
1563 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1564 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1565
1566 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1567 "Configure the server to play on, your username, password and other server-related options.");
1568 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1569 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1570 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1571 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1572 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1573 "Configure the use of audio, sound effects and background music.");
1574 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1575 "Lets you define, edit and delete bindings."
1576 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1577 . "with nothing set and the recording started. After doing the actions you "
1578 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1579 . "After pressing the combo the binding will be saved automatically and the "
1580 . "binding editor closes");
1581 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
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.");
1585
1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1586 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1274 1587
1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1588 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1276 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1589 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1590
1278 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1279 $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,
1280 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.");
1281 1593
1282 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
1283 1595
1284 $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,
1285 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.");
1286 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1287 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1599 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1288 ."You can also hit the Tab-key to show/hide the Inventory."); 1600 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1289 1601
1290 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1291 text => "Save Config", 1603 text => "Save Config",
1292 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1604 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1293 on_activate => sub { 1605 on_activate => sub {
… …
1295 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1607 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1296 status "Configuration Saved"; 1608 status "Configuration Saved";
1297 }, 1609 },
1298 ); 1610 );
1299 1611
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1612 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1301 tooltip => "View Documentation"); 1613 tooltip => "View Documentation");
1302
1303 $BUTTONBAR->add (new CFClient::UI::Flopper
1304 text => "Bindings",
1305 other => make_binding_window,
1306 tooltip =>
1307 "Lets you define, edit and delete bindings."
1308 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1309 ."with nothing set and the recording started. After doing the actions you "
1310 ."want to record press Insert and you will be asked to press a key-combo."
1311 ."After pressing the combo the binding will be saved automatically and the "
1312 ."binding editor closes");
1313
1314 $BUTTONBAR->add (new CFClient::UI::Flopper
1315 text => "Spells",
1316 other => make_spell_list,
1317 tooltip => "The spell list");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Pickup",
1321 other => make_pickup_cfg_window,
1322 tooltip => "The pickup dialog");
1323
1324 1614
1325 $BUTTONBAR->add (new CFClient::UI::Button 1615 $BUTTONBAR->add (new CFClient::UI::Button
1326 text => "Quit", 1616 text => "Quit",
1327 tooltip => "Terminates the program", 1617 tooltip => "Terminates the program",
1328 on_activate => sub { 1618 on_activate => sub {
… …
1333 } 1623 }
1334 }, 1624 },
1335 ); 1625 );
1336 1626
1337 $BUTTONBAR->show; 1627 $BUTTONBAR->show;
1338 $SERVER_SETUP->show; 1628 $SETUP_DIALOG->show;
1339
1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1341 } 1629 }
1630
1631 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1342} 1632}
1343 1633
1344sub video_shutdown { 1634sub video_shutdown {
1345 undef $SDL_ACTIVE; 1635 undef $SDL_ACTIVE;
1346} 1636}
… …
1478}; 1768};
1479 1769
1480 CFClient::SDL_GL_SwapBuffers; 1770 CFClient::SDL_GL_SwapBuffers;
1481} 1771}
1482 1772
1483my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1773my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1484 $NOW = time; 1774 $NOW = time;
1485 1775
1486 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1776 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1487 for CFClient::SDL_PollEvent; 1777 for CFClient::SDL_PollEvent;
1488 1778
… …
1555############################################################################# 1845#############################################################################
1556 1846
1557$SIG{INT} = $SIG{TERM} = sub { exit }; 1847$SIG{INT} = $SIG{TERM} = sub { exit };
1558 1848
1559{ 1849{
1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1850 local $SIG{__DIE__} = sub {
1851 return unless defined $^S && !$^S;
1852 Carp::confess $_[1];#d#TODO: remove when stable
1853 CFClient::fatal $_[0];
1854 };
1561 1855
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1856 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1857 CFClient::UI::set_layout ($::CFG->{layout});
1564 1858
1565 my %DEF_CFG = ( 1859 my %DEF_CFG = (
… …
1571 map_scale => 1, 1865 map_scale => 1,
1572 fow_enable => 1, 1866 fow_enable => 1,
1573 fow_intensity => 0.45, 1867 fow_intensity => 0.45,
1574 fow_smooth => 0, 1868 fow_smooth => 0,
1575 gui_fontsize => 1, 1869 gui_fontsize => 1,
1576 log_fontsize => 1, 1870 log_fontsize => 0.7,
1577 gauge_fontsize=> 1, 1871 gauge_fontsize=> 1,
1578 gauge_size => 0.35, 1872 gauge_size => 0.35,
1579 stat_fontsize => 1, 1873 stat_fontsize => 0.7,
1580 mapsize => 100, 1874 mapsize => 100,
1581 host => "crossfire.schmorp.de", 1875 host => "crossfire.schmorp.de",
1582 say_command => 'say', 1876 say_command => 'say',
1583 audio_enable => 1, 1877 audio_enable => 1,
1584 bgm_enable => 1, 1878 bgm_enable => 1,
1585 bgm_volume => 0.25, 1879 bgm_volume => 0.25,
1586 face_prefetch => 0, 1880 face_prefetch => 0,
1587 output_sync => 1, 1881 output_sync => 1,
1588 output_count => 1, 1882 output_count => 1,
1883 pickup => 0,
1589 ); 1884 );
1590 1885
1591 while (my ($k, $v) = each %DEF_CFG) { 1886 while (my ($k, $v) = each %DEF_CFG) {
1592 $CFG->{$k} = $v unless exists $CFG->{$k}; 1887 $CFG->{$k} = $v unless exists $CFG->{$k};
1593 } 1888 }
… …
1640 video_init; 1935 video_init;
1641 audio_init; 1936 audio_init;
1642} 1937}
1643 1938
1644Event::loop; 1939Event::loop;
1940#CFClient::SDL_Quit;
1941#CFClient::_exit 0;
1645 1942
1646END { CFClient::SDL_Quit } 1943END { CFClient::SDL_Quit }
1647 1944
1648=head1 NAME 1945=head1 NAME
1649 1946

Diff Legend

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