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.46 by elmex, Fri Jun 2 18:46:16 2006 UTC vs.
Revision 1.67 by root, Sun Jun 11 18:36:15 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
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;
178 368
179 return unless $CONN; 369 return unless $CONN;
180 370
181 status "connection closed"; 371 status "connection closed";
182 372
373 destroy_query_dialog $CONN;
183 $CONN->destroy; 374 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 375 $CONN = 0; # false, does not autovivify
185} 376}
186 377
187sub client_setup { 378sub 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); 379 my $vbox = new CFClient::UI::VBox;
194 380
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 381 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 382
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 383 $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); 384 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 508 on_activate => sub {
323 video_shutdown (); 509 video_shutdown ();
324 video_init (); 510 video_init ();
325 } 511 }
326 ); 512 );
513
514 $vbox
515}
516
517sub audio_setup {
518 my $vbox = new CFClient::UI::VBox;
519
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
521
522 my $row = 0;
327 523
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 526 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.", 527 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 (); 558 audio_shutdown ();
363 audio_init (); 559 audio_init ();
364 } 560 }
365 ); 561 );
366 562
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $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} 564}
381 565
382sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
442 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
443 627
444 $win 628 $win
445} 629}
446 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
447 633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
448sub make_stats_window { 659sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8), 661 y => $HEIGHT * (2/8),
451 x => "max", 662 x => "max",
452 title => "Stats", 663 title => "Stats",
453 name => "stats_window"; 664 name => "stats_window";
… …
557 update_stats_window ({}); 768 update_stats_window ({});
558 769
559 $tgw 770 $tgw
560} 771}
561 772
562sub formsep { 773sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 775}
565 776
566sub update_stats_window { 777sub update_stats_window {
567 my ($stats) = @_; 778 my ($stats) = @_;
568 779
… …
663 874
664 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
665 876
666 $table->clear; 877 $table->clear;
667 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
668 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
669 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
670 for 0 .. $#col; 891 for 0 .. $#col;
671 892
672 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
673 894
674 my $y = 0; 895 my $y = 0;
675 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
692 913
693 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
694 915
695 $y++; 916 $y++;
696 917
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility; 924 $METASERVER->hide;
925 },
701 }), 926 ),
702 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
703 ]); 928 ]);
704 929
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
706 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
707 for 0 .. $#$m; 938 for 0 .. $#$m;
708 } 939 }
709 } 940 }
710 }); 941 });
711} 942}
712 943
713sub metaserver_dialog { 944sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame 945 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 946 title => "Server List",
716 name => 'metaserver_dialog', 947 name => 'metaserver_dialog',
717 x => 'center', 948 x => 'center',
718 y => 'center', 949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
719 child => (my $vbox = new CFClient::UI::VBox), 952 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 953 on_visibility_change => sub {
721 update_metaserver if $_[1]; 954 update_metaserver if $_[1];
722 }, 955 },
723 ; 956 ;
724 957
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
726 961
727 $dialog 962 $dialog
728} 963}
729 964
730sub server_setup { 965sub 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), 966 my $vbox = new CFClient::UI::VBox;
737 ;
738 967
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 968 $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"); 969 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 970
742 { 971 {
… …
759 expand => 1, 988 expand => 1,
760 text => "Server List", 989 text => "Server List",
761 other => $METASERVER, 990 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 992 on_activate => sub { $METASERVER->toggle_visibility },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
764 ); 994 );
765 } 995 }
766 996
767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
768 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
835 $CONN ? stop_game 1065 $CONN ? stop_game
836 : start_game; 1066 : start_game;
837 }, 1067 },
838 ); 1068 );
839 1069
840 $dialog 1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1072 text => $CFG->{say_command},
1073 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. "
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub {
1077 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value;
1079 }
1080 );
1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
841} 1092}
842 1093
843sub message_window { 1094sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1096 name => "message_window",
846 title => "Messages", 1097 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
849 x => "max", 1100 x => "max",
850 y => 0, 1101 y => 0,
851 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
854 1105
855 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
856 1107
857 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
900sub open_quit_dialog { 1151sub open_quit_dialog {
901 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
902 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center", 1154 x => "center",
904 y => "center", 1155 y => "center",
1156 z => 50,
905 title => "Really Quit?", 1157 title => "Really Quit?",
906 ; 1158 ;
907 1159
908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
909 1161
… …
926 } 1178 }
927 1179
928 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
929} 1181}
930 1182
931sub make_pickup_cfg_window { 1183sub autopickup_setup {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame 1184 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 1185
949 for ( 1186 for (
950 ["General", $gen_tbl], 1187 ["General", 0, 0,
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1188 ["Enable autopickup" => PICKUP_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1190 ["Stop before pickup" => PICKUP_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
955 ["Weapons", $ltbl], 1193 ["Weapons", 0, 6,
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1194 ["All weapons" => PICKUP_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW], 1196 ["Bows" => PICKUP_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW], 1197 ["Arrows" => PICKUP_ARROW],
1198 ],
960 ["Armour"], 1199 ["Armour", 0, 12,
961 ["Helmets" => CFClient::Pickup::PU_HELMET], 1200 ["Helmets" => PICKUP_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD], 1201 ["Shields" => PICKUP_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1202 ["Body Armour" => PICKUP_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS], 1203 ["Boots" => PICKUP_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1204 ["Gloves" => PICKUP_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
967 ["Readables", $rtbl], 1208 ["Readables", 2, 2,
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1209 ["Spellbooks" => PICKUP_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
971 ["Misc"], 1213 ["Misc", 2, 7,
972 ["Food" => CFClient::Pickup::PU_FOOD], 1214 ["Food" => PICKUP_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK], 1215 ["Drinks" => PICKUP_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY], 1217 ["Keys" => PICKUP_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1218 ["Magical Items" => PICKUP_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION], 1219 ["Potions" => PICKUP_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
981 ) 1225 )
982 { 1226 {
983 if (ref $_->[1]) { 1227 my ($title, $x, $y, @bits) = @$_;
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
987 } elsif (not defined $_->[1]) { 1229
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1230 for (@bits) {
989 } else { 1231 ++$y;
1232
990 my $mask = $_->[1]; 1233 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask, 1236 state => $CFG->{pickup} & $mask,
994 on_changed => sub { 1237 on_changed => sub {
995 my ($box, $value) = @_; 1238 my ($box, $value) = @_;
1239
996 if ($value) { 1240 if ($value) {
997 $::CFG->{pickup} |= $mask; 1241 $::CFG->{pickup} |= $mask;
998 } else { 1242 } else {
999 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1243 $::CFG->{pickup} &= ~$mask;
1000 } 1244 }
1245
1001 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1002 if defined $::CONN; 1247 if defined $::CONN;
1003 }); 1248 });
1004 } 1249 }
1005 } 1250 }
1006 1251
1007 $PICKUP_CFG 1252 $table->add (2, 18, new CFClient::UI::ValSlider
1008} 1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1009 1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
1010sub make_inventory_window { 1274sub inventory_window {
1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center", 1276 x => "center",
1013 y => "center", 1277 y => "center",
1014 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
1015 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
… …
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033 1297
1034 $invwin 1298 $invwin
1035} 1299}
1036 1300
1037sub make_spell_list { 1301sub spell_setup {
1038 $SPELL_LIST = new CFClient::UI::SpellList 1302 new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
1042} 1303}
1043 1304
1044sub make_binding_window { 1305sub keyboard_setup {
1045 my $binding_list = new CFClient::UI::VBox; 1306 my $binding_list = new CFClient::UI::VBox;
1046 1307
1047 my $refresh; 1308 my $refresh;
1048 $refresh = sub { 1309 $refresh = sub {
1049 $binding_list->clear (); 1310 $binding_list->clear ();
… …
1073 sub { 1334 sub {
1074 my ($nmod, $nsym, $ncmds) = @_; 1335 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym}; 1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->(); 1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1078 $::BIND_WINDOW->show; 1340 $SETUP_DIALOG->show;
1079 }, 1341 },
1080 sub { 1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1081 $::BIND_WINDOW->show; 1344 $SETUP_DIALOG->show;
1082 }); 1345 });
1083 $::BIND_EDITOR->show; 1346 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide; 1347 $SETUP_DIALOG->hide;
1085 }); 1348 });
1086 1349
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 } 1352 }
1090 } 1353 }
1091 }; 1354 };
1092 1355
1093 $BIND_WINDOW = new CFClient::UI::FancyFrame
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); 1356 my $vb = new CFClient::UI::VBox;
1105 $vb->add ($binding_list); 1357 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox); 1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359
1107 $hb->add (new CFClient::UI::Button 1360 $hb->add (new CFClient::UI::Button
1108 text => "record new", 1361 text => "record new",
1109 expand => 1, 1362 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.", 1363 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub { 1364 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [], 1365 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub { 1366 sub {
1114 my ($mod, $sym, $cmds) = @_; 1367 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->(); 1369 $refresh->();
1117 $::BIND_WINDOW->show; 1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show;
1118 }, 1372 },
1119 sub { 1373 sub {
1120 $::BIND_WINDOW->show; 1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1375 $SETUP_DIALOG->show;
1121 }); 1376 },
1122 $::BIND_WINDOW->hide; 1377 );
1378 $SETUP_DIALOG->hide;
1123 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1124 }, 1380 },
1125 ); 1381 );
1382
1126 $hb->add (new CFClient::UI::Button 1383 $hb->add (new CFClient::UI::Button
1127 text => "close", 1384 text => "close",
1128 tooltip => "Closes the binding window", 1385 tooltip => "Closes the binding window",
1129 expand => 1, 1386 expand => 1,
1130 on_activate => sub { 1387 on_activate => sub {
1131 $::BIND_WINDOW->hide; 1388 $SETUP_DIALOG->hide;
1132 } 1389 }
1133 ); 1390 );
1134 1391
1135 $refresh->(); 1392 $refresh->();
1136 $BIND_WINDOW
1137}
1138 1393
1394 $vb
1395}
1396
1139sub make_help_window { 1397sub help_window {
1140 my $win = new CFClient::UI::FancyFrame 1398 my $win = new CFClient::UI::FancyFrame
1141 x => 'center', 1399 x => 'center',
1142 y => 'center', 1400 y => 'center',
1401 z => 2,
1143 name => 'doc_browser', 1402 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8, 1403 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8, 1404 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation"; 1405 title => "Documentation";
1147 1406
1148 $win->add (my $vbox = new CFClient::UI::VBox); 1407 $win->add (my $vbox = new CFClient::UI::VBox);
1149 1408
1150 $vbox->add (my $buttons = new CFClient::UI::HBox); 1409 $vbox->add (my $buttons = new CFClient::UI::HBox);
1151 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4);
1152 1412
1153 for ( 1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef,
1416 options => [
1154 [intro => "Introduction"], 1417 [intro => "Introduction"],
1155 [manual => "Manual"], 1418 [manual => "Manual"],
1419 [skill_help => "Skills"],
1156 [command_help => "Commands"], 1420 [command_help => "Commands"],
1157 [skill_help => "Skills"], 1421 [dmcommand_help => "DM Commands"],
1158 ) { 1422 [COPYING => "License Terms"],
1159 my ($pod, $label) = @$_; 1423 ],
1424 on_changed => sub {
1425 my ($self, $pod) = @_;
1160 1426
1161 $buttons->add (new CFClient::UI::Button 1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1162 text => $label, 1428 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 1429
1167 $viewer->clear; 1430 $viewer->clear;
1168 1431
1169 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1170 for @{ CFClient::pod_to_pango_list $pom }; 1433 for @$pom;
1171 1434
1172 $viewer->set_offset (0); 1435 $viewer->set_offset (0);
1173 }, 1436 },
1437 on_visibility_change => sub {
1438 my ($self, $visible) = @_;
1439 return unless $visible;
1440 return if $self->{value};
1441 $self->set_value ("intro");
1442 },
1174 ); 1443 );
1175 }
1176
1177 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1178 1444
1179 $win 1445 $win
1180} 1446}
1181 1447
1182sub sdl_init { 1448sub sdl_init {
… …
1222 $DEBUG_STATUS->show; 1488 $DEBUG_STATUS->show;
1223 1489
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225 1491
1226 $STATUSBOX = new CFClient::UI::Statusbox; 1492 $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]); 1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1228 1494
1229 (new CFClient::UI::Frame 1495 (new CFClient::UI::Frame
1230 bg => [0, 0, 0, 0.4], 1496 bg => [0, 0, 0, 0.4],
1231 force_x => 0, 1497 force_x => 0,
1232 force_y => "max", 1498 force_y => "max",
1233 child => $STATUSBOX, 1499 child => $STATUSBOX,
1234 )->show; 1500 )->show;
1235 1501
1236 CFClient::UI::FancyFrame->new ( 1502 CFClient::UI::FancyFrame->new (
1237 title => "Mini Map", 1503 title => "Map",
1238 name => "mapmap", 1504 name => "mapmap",
1239 x => 0, 1505 x => 0,
1240 y => $FONTSIZE + 8, 1506 y => $FONTSIZE + 8,
1241 border_bg => [1, 1, 1, 192/255], 1507 border_bg => [1, 1, 1, 192/255],
1242 bg => [1, 1, 1, 0], 1508 bg => [1, 1, 1, 0],
… …
1259 } 1525 }
1260 }); 1526 });
1261 $MAPWIDGET->show; 1527 $MAPWIDGET->show;
1262 $MAPWIDGET->focus_in; 1528 $MAPWIDGET->focus_in;
1263 1529
1264 $LOGVIEW = new CFClient::UI::TextView 1530 $LOGVIEW = new CFClient::UI::TextScroller
1265 expand => 1, 1531 expand => 1,
1266 font => $FONT_FIXED, 1532 font => $FONT_FIXED,
1267 fontsize => $::CFG->{log_fontsize}, 1533 fontsize => $::CFG->{log_fontsize},
1534 indent => -4,
1268 can_hover => 1, 1535 can_hover => 1,
1269 can_events => 1, 1536 can_events => 1,
1270 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1537 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1271 ; 1538 ;
1272 1539
1540 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1541 title => "Setup",
1542 name => "setup_dialog",
1543 x => 'center',
1544 y => 'center',
1545 z => 2,
1546 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6,
1548 ;
1549
1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1554 "Configure the server to play on, your username, password and other server-related options.");
1555 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1556 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask.");
1572
1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1274 1574
1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1575 $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."); 1576 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, 1577
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, 1578 $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."); 1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1281 1580
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 1581 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1283 1582
1284 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1285 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1286 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1585 $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 :)." 1586 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."); 1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1289 1588
1290 $BUTTONBAR->add (new CFClient::UI::Button 1589 $BUTTONBAR->add (new CFClient::UI::Button
1291 text => "Save Config", 1590 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.", 1591 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 { 1592 on_activate => sub {
… …
1295 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1296 status "Configuration Saved"; 1595 status "Configuration Saved";
1297 }, 1596 },
1298 ); 1597 );
1299 1598
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1301 tooltip => "View Documentation"); 1600 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 1601
1325 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1326 text => "Quit", 1603 text => "Quit",
1327 tooltip => "Terminates the program", 1604 tooltip => "Terminates the program",
1328 on_activate => sub { 1605 on_activate => sub {
… …
1333 } 1610 }
1334 }, 1611 },
1335 ); 1612 );
1336 1613
1337 $BUTTONBAR->show; 1614 $BUTTONBAR->show;
1338 $SERVER_SETUP->show; 1615 $SETUP_DIALOG->show;
1339
1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1341 } 1616 }
1617
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1342} 1619}
1343 1620
1344sub video_shutdown { 1621sub video_shutdown {
1345 undef $SDL_ACTIVE; 1622 undef $SDL_ACTIVE;
1346} 1623}
… …
1478}; 1755};
1479 1756
1480 CFClient::SDL_GL_SwapBuffers; 1757 CFClient::SDL_GL_SwapBuffers;
1481} 1758}
1482 1759
1483my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1760my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1484 $NOW = time; 1761 $NOW = time;
1485 1762
1486 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1763 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1487 for CFClient::SDL_PollEvent; 1764 for CFClient::SDL_PollEvent;
1488 1765
… …
1555############################################################################# 1832#############################################################################
1556 1833
1557$SIG{INT} = $SIG{TERM} = sub { exit }; 1834$SIG{INT} = $SIG{TERM} = sub { exit };
1558 1835
1559{ 1836{
1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1837 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable
1840 CFClient::fatal $_[0];
1841 };
1561 1842
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1844 CFClient::UI::set_layout ($::CFG->{layout});
1564 1845
1565 my %DEF_CFG = ( 1846 my %DEF_CFG = (
… …
1571 map_scale => 1, 1852 map_scale => 1,
1572 fow_enable => 1, 1853 fow_enable => 1,
1573 fow_intensity => 0.45, 1854 fow_intensity => 0.45,
1574 fow_smooth => 0, 1855 fow_smooth => 0,
1575 gui_fontsize => 1, 1856 gui_fontsize => 1,
1576 log_fontsize => 1, 1857 log_fontsize => 0.7,
1577 gauge_fontsize=> 1, 1858 gauge_fontsize=> 1,
1578 gauge_size => 0.35, 1859 gauge_size => 0.35,
1579 stat_fontsize => 1, 1860 stat_fontsize => 0.7,
1580 mapsize => 100, 1861 mapsize => 100,
1581 host => "crossfire.schmorp.de", 1862 host => "crossfire.schmorp.de",
1582 say_command => 'say', 1863 say_command => 'say',
1583 audio_enable => 1, 1864 audio_enable => 1,
1584 bgm_enable => 1, 1865 bgm_enable => 1,
1585 bgm_volume => 0.25, 1866 bgm_volume => 0.25,
1586 face_prefetch => 0, 1867 face_prefetch => 0,
1587 output_sync => 1, 1868 output_sync => 1,
1588 output_count => 1, 1869 output_count => 1,
1870 pickup => 0,
1589 ); 1871 );
1590 1872
1591 while (my ($k, $v) = each %DEF_CFG) { 1873 while (my ($k, $v) = each %DEF_CFG) {
1592 $CFG->{$k} = $v unless exists $CFG->{$k}; 1874 $CFG->{$k} = $v unless exists $CFG->{$k};
1593 } 1875 }

Diff Legend

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