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.43 by elmex, Fri Jun 2 16:27:28 2006 UTC vs.
Revision 1.65 by root, Thu Jun 8 01:51:32 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;
88 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
89our $FLOORBOX; 98our $FLOORBOX;
90our $GAUGES; 99our $GAUGES;
91our $STATWIDS; 100our $STATWIDS;
92 101
93our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 113our $INV_WINDOW;
105our $INV; 114our $INV;
106our $INVR; 115our $INVR;
107our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
108 117
109our $BIND_WINDOW;
110our $BIND_EDITOR; 118our $BIND_EDITOR;
111 119
112our $SPELL_LIST;
113our $PICKUP_CFG; 120our $PICKUP_CFG;
114 121
115sub status { 122sub status {
116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
117} 124}
118 125
119sub debug { 126sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
121} 128}
122 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
309}
310
123sub start_game { 311sub start_game {
124 status "logging in..."; 312 status "logging in...";
125 313
126 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
128 316
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 318
131 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
132 320
… …
144 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 333 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
147 map => $MAP, 335 map => $MAP,
148 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
149 338
150 sound_play => sub { 339 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
152 341
153 $SDL_MIXER 342 $SDL_MIXER
… …
170 } 359 }
171} 360}
172 361
173sub stop_game { 362sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178 367
179 return unless $CONN; 368 return unless $CONN;
180 369
181 status "connection closed"; 370 status "connection closed";
182 371
372 destroy_query_dialog $CONN;
183 $CONN->destroy; 373 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
185} 375}
186 376
187sub client_setup { 377sub 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); 378 my $vbox = new CFClient::UI::VBox;
194 379
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 381
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $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); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
322 on_activate => sub { 507 on_activate => sub {
323 video_shutdown (); 508 video_shutdown ();
324 video_init (); 509 video_init ();
325 } 510 }
326 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
327 522
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 525 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.", 526 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 (); 557 audio_shutdown ();
363 audio_init (); 558 audio_init ();
364 } 559 }
365 ); 560 );
366 561
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $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} 563}
381 564
382sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
442 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
443 626
444 $win 627 $win
445} 628}
446 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
447 632
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
641
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643
644 for my $x (0..2) {
645 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry
648 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 );
651 }
652 }
653
654
655 $table
656}
657
448sub make_stats_window { 658sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
451 x => "max", 661 x => "max",
452 title => "Stats", 662 title => "Stats",
453 name => "stats_window"; 663 name => "stats_window";
… …
557 update_stats_window ({}); 767 update_stats_window ({});
558 768
559 $tgw 769 $tgw
560} 770}
561 771
562sub formsep { 772sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 774}
565 775
566sub update_stats_window { 776sub update_stats_window {
567 my ($stats) = @_; 777 my ($stats) = @_;
568 778
… …
663 873
664 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
665 875
666 $table->clear; 876 $table->clear;
667 877
878 my @tip = (
879 "The current number of users logged in on the server.",
880 "The hostname of the server.",
881 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.",
884 );
668 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
669 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 886 $table->add ($_, 0, new CFClient::UI::Label
887 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_])
670 for 0 .. $#col; 890 for 0 .. $#col;
671 891
672 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
673 893
674 my $y = 0; 894 my $y = 0;
675 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
692 912
693 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
694 914
695 $y++; 915 $y++;
696 916
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (new CFClient::UI::Button text => "Use", on_activate => sub { 918 (new CFClient::UI::Button
919 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility; 923 $METASERVER->hide;
924 },
701 }), 925 ),
702 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
703 ]); 927 ]);
704 928
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
706 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 930 ellipsise => 0,
931 align => $align[$_],
932 text => $m->[$_],
933 tooltip => $tip[$_],
934 can_hover => 1,
935 can_events => 1,
936 fontsize => 0.8)
707 for 0 .. $#$m; 937 for 0 .. $#$m;
708 } 938 }
709 } 939 }
710 }); 940 });
711} 941}
712 942
713sub metaserver_dialog { 943sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 945 title => "Server List",
716 name => 'metaserver_dialog', 946 name => 'metaserver_dialog',
717 x => 'center', 947 x => 'center',
718 y => 'center', 948 y => 'center',
949 z => 3,
950 force_h => $::HEIGHT * 0.4,
719 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub { 952 on_visibility_change => sub {
721 update_metaserver if $_[1]; 953 update_metaserver if $_[1];
722 }, 954 },
723 ; 955 ;
724 956
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
726 960
727 $dialog 961 $dialog
728} 962}
729 963
730sub server_setup { 964sub 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), 965 my $vbox = new CFClient::UI::VBox;
737 ;
738 966
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 967 $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"); 968 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 969
742 { 970 {
… …
759 expand => 1, 987 expand => 1,
760 text => "Server List", 988 text => "Server List",
761 other => $METASERVER, 989 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
764 ); 993 );
765 } 994 }
766 995
767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
768 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
835 $CONN ? stop_game 1064 $CONN ? stop_game
836 : start_game; 1065 : start_game;
837 }, 1066 },
838 ); 1067 );
839 1068
840 $dialog 1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1071 text => $CFG->{say_command},
1072 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. "
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub {
1076 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value;
1078 }
1079 );
1080
1081 $vbox
841} 1082}
842 1083
843sub message_window { 1084sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1085 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1086 name => "message_window",
846 title => "Messages", 1087 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
849 x => "max", 1090 x => "max",
850 y => 0, 1091 y => 0,
851 force_w => $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
854 1095
855 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
856 1097
857 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
871 }, 1112 },
872 on_activate => sub { 1113 on_activate => sub {
873 my ($input, $text) = @_; 1114 my ($input, $text) = @_;
874 $input->set_text (''); 1115 $input->set_text ('');
875 1116
876 if ($text =~ /^\/bind\s+(.*)$/) {
877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
881 } elsif ($text =~ /^\/(.*)/) { 1117 if ($text =~ /^\/(.*)/) {
882 $::CONN->user_send ($1); 1118 $::CONN->user_send ($1);
883 } else { 1119 } else {
884 my $say_cmd = $::CFG->{say_command} || 'say'; 1120 my $say_cmd = $::CFG->{say_command} || 'say';
885 $::CONN->user_send ("$say_cmd $text"); 1121 $::CONN->user_send ("$say_cmd $text");
886 } 1122 }
… …
905sub open_quit_dialog { 1141sub open_quit_dialog {
906 unless ($QUIT_DIALOG) { 1142 unless ($QUIT_DIALOG) {
907 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center", 1144 x => "center",
909 y => "center", 1145 y => "center",
1146 z => 50,
910 title => "Really Quit?", 1147 title => "Really Quit?",
911 ; 1148 ;
912 1149
913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
914 1151
… …
931 } 1168 }
932 1169
933 $QUIT_DIALOG->show; 1170 $QUIT_DIALOG->show;
934} 1171}
935 1172
936sub make_pickup_cfg_window { 1173sub autopickup_setup {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 x => "center",
939 y => "center",
940 force_w => $WIDTH * 3/10,
941 force_h => $HEIGHT * 9/10;
942
943 my $tbl = new CFClient::UI::Table; 1174 my $table = new CFClient::UI::Table;
944 my $tblrow = 0;
945 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl);
946 1175
947 for ( 1176 for (
948 ["General"], 1177 ["General", 0, 0,
949 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE], 1178 ["Enable autopickup" => PICKUP_NEWMODE],
950 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1179 ["Inhibit autopickup" => PICKUP_INHIBIT],
951 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1180 ["Stop before pickup" => PICKUP_STOP],
952 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1181 ["Debug autopickup" => PICKUP_DEBUG],
1182 ],
953 ["Weapons"], 1183 ["Weapons", 0, 6,
954 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1184 ["All weapons" => PICKUP_ALLWEAPON],
955 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1185 ["Missile weapons" => PICKUP_MISSILEWEAPON],
956 ["Bows" => CFClient::Pickup::PU_BOW], 1186 ["Bows" => PICKUP_BOW],
957 ["Arrows" => CFClient::Pickup::PU_ARROW], 1187 ["Arrows" => PICKUP_ARROW],
1188 ],
958 ["Armour"], 1189 ["Armour", 0, 12,
959 ["Helmets" => CFClient::Pickup::PU_HELMET], 1190 ["Helmets" => PICKUP_HELMET],
960 ["Shields" => CFClient::Pickup::PU_SHIELD], 1191 ["Shields" => PICKUP_SHIELD],
961 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1192 ["Body Armour" => PICKUP_ARMOUR],
962 ["Boots" => CFClient::Pickup::PU_BOOTS], 1193 ["Boots" => PICKUP_BOOTS],
963 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1194 ["Gloves" => PICKUP_GLOVES],
964 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1195 ["Cloaks" => PICKUP_CLOAK],
1196 ],
1197
965 ["Readables"], 1198 ["Readables", 2, 2,
966 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1199 ["Spellbooks" => PICKUP_SPELLBOOK],
967 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
968 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1202 ],
969 ["Misc"], 1203 ["Misc", 2, 7,
970 ["Food" => CFClient::Pickup::PU_FOOD], 1204 ["Food" => PICKUP_FOOD],
971 ["Drinks" => CFClient::Pickup::PU_DRINK], 1205 ["Drinks" => PICKUP_DRINK],
972 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
973 ["Keys" => CFClient::Pickup::PU_KEY], 1207 ["Keys" => PICKUP_KEY],
974 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1208 ["Magical Items" => PICKUP_MAGICAL],
975 ["Potions" => CFClient::Pickup::PU_POTION], 1209 ["Potions" => PICKUP_POTION],
976 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
977 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
978 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1212 ["Jewelery" => PICKUP_JEWELS],
1213 ],
979 ) 1214 )
980 { 1215 {
981 unless (defined $_->[1]) { 1216 my ($title, $x, $y, @bits) = @$_;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0); 1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } else { 1218
1219 for (@bits) {
1220 ++$y;
1221
984 my $mask = $_->[1]; 1222 my $mask = $_->[1];
985 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1); 1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1225 state => $CFG->{pickup} & $mask,
988 on_changed => sub { 1226 on_changed => sub {
989 my ($box, $value) = @_; 1227 my ($box, $value) = @_;
1228
990 if ($value) { 1229 if ($value) {
991 $CFG->{pickup} |= $mask; 1230 $::CFG->{pickup} |= $mask;
992 } else { 1231 } else {
993 $CFG->{pickup} = $CFG->{pickup} & ~$mask; 1232 $::CFG->{pickup} &= ~$mask;
994 } 1233 }
1234
995 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup}); 1235 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN;
996 }); 1237 });
997 } 1238 }
998 } 1239 }
999 1240
1000 $PICKUP_CFG 1241 $table
1001} 1242}
1002 1243
1003sub make_inventory_window { 1244sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1246 x => "center",
1006 y => "center", 1247 y => "center",
1007 force_w => $WIDTH * 9/10, 1248 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1249 force_h => $HEIGHT * 9/10,
… …
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026 1267
1027 $invwin 1268 $invwin
1028} 1269}
1029 1270
1030sub make_spell_list { 1271sub spell_setup {
1031 $SPELL_LIST = new CFClient::UI::SpellList 1272 new CFClient::UI::SpellList
1032 force_w => $WIDTH * (9/10),
1033 force_h => $HEIGHT * (9/10);
1034 $SPELL_LIST
1035} 1273}
1036 1274
1037sub make_binding_window { 1275sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1276 my $binding_list = new CFClient::UI::VBox;
1039 1277
1040 my $refresh; 1278 my $refresh;
1041 $refresh = sub { 1279 $refresh = sub {
1042 $binding_list->clear (); 1280 $binding_list->clear ();
… …
1066 sub { 1304 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1305 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1306 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->(); 1308 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1071 $::BIND_WINDOW->show; 1310 $SETUP_DIALOG->show;
1072 }, 1311 },
1073 sub { 1312 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $::BIND_WINDOW->show; 1314 $SETUP_DIALOG->show;
1075 }); 1315 });
1076 $::BIND_EDITOR->show; 1316 $::BIND_EDITOR->show;
1077 $::BIND_WINDOW->hide; 1317 $SETUP_DIALOG->hide;
1078 }); 1318 });
1079 1319
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 } 1322 }
1083 } 1323 }
1084 }; 1324 };
1085 1325
1086 $BIND_WINDOW = new CFClient::UI::FancyFrame
1087 title => "Bindings",
1088 x => "center",
1089 y => "center",
1090 def_w => int $WIDTH * 9/10,
1091 def_h => int $HEIGHT * 9/10,
1092 on_visibility_change => sub {
1093 my ($self, $visible) = @_;
1094 $refresh->() if $visible;
1095 };
1096
1097 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1326 my $vb = new CFClient::UI::VBox;
1098 $vb->add ($binding_list); 1327 $vb->add ($binding_list);
1099 $vb->add (my $hb = new CFClient::UI::HBox); 1328 $vb->add (my $hb = new CFClient::UI::HBox);
1329
1100 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1101 text => "record new", 1331 text => "record new",
1102 expand => 1, 1332 expand => 1,
1103 tooltip => "This button opens the binding editor with an empty binding.", 1333 tooltip => "This button opens the binding editor with an empty binding.",
1104 on_activate => sub { 1334 on_activate => sub {
1105 $::BIND_EDITOR->set_binding (undef, undef, [], 1335 $::BIND_EDITOR->set_binding (undef, undef, [],
1106 sub { 1336 sub {
1107 my ($mod, $sym, $cmds) = @_; 1337 my ($mod, $sym, $cmds) = @_;
1108 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1109 $refresh->(); 1339 $refresh->();
1110 $::BIND_WINDOW->show; 1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show;
1111 }, 1342 },
1112 sub { 1343 sub {
1113 $::BIND_WINDOW->show; 1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show;
1114 }); 1346 },
1115 $::BIND_WINDOW->hide; 1347 );
1348 $SETUP_DIALOG->hide;
1116 $::BIND_EDITOR->show; 1349 $::BIND_EDITOR->show;
1117 }, 1350 },
1118 ); 1351 );
1352
1119 $hb->add (new CFClient::UI::Button 1353 $hb->add (new CFClient::UI::Button
1120 text => "close", 1354 text => "close",
1121 tooltip => "Closes the binding window", 1355 tooltip => "Closes the binding window",
1122 expand => 1, 1356 expand => 1,
1123 on_activate => sub { 1357 on_activate => sub {
1124 $::BIND_WINDOW->hide; 1358 $SETUP_DIALOG->hide;
1125 } 1359 }
1126 ); 1360 );
1127 1361
1128 $refresh->(); 1362 $refresh->();
1129 $BIND_WINDOW
1130}
1131 1363
1364 $vb
1365}
1366
1132sub make_help_window { 1367sub help_window {
1133 my $win = new CFClient::UI::FancyFrame 1368 my $win = new CFClient::UI::FancyFrame
1134 x => 'center', 1369 x => 'center',
1135 y => 'center', 1370 y => 'center',
1371 z => 2,
1136 name => 'doc_browser', 1372 name => 'doc_browser',
1137 force_w => int $WIDTH * 7/8, 1373 force_w => int $WIDTH * 7/8,
1138 force_h => int $HEIGHT * 7/8, 1374 force_h => int $HEIGHT * 7/8,
1139 title => "Documentation"; 1375 title => "Documentation";
1140 1376
1141 $win->add (my $vbox = new CFClient::UI::VBox); 1377 $win->add (my $vbox = new CFClient::UI::VBox);
1142 1378
1143 $vbox->add (my $buttons = new CFClient::UI::HBox); 1379 $vbox->add (my $buttons = new CFClient::UI::HBox);
1144 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1381 expand => 1, fontsize => 0.8, padding_x => 4);
1145 1382
1146 for ( 1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef,
1386 options => [
1147 [intro => "Introduction"], 1387 [intro => "Introduction"],
1148 [manual => "Manual"], 1388 [manual => "Manual"],
1389 [skill_help => "Skills"],
1149 [command_help => "Commands"], 1390 [command_help => "Commands"],
1150 [skill_help => "Skills"], 1391 [dmcommand_help => "DM Commands"],
1151 ) { 1392 [COPYING => "License Terms"],
1152 my ($pod, $label) = @$_; 1393 ],
1394 on_changed => sub {
1395 my ($self, $pod) = @_;
1153 1396
1154 $buttons->add (new CFClient::UI::Button 1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1155 text => $label, 1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1156 on_activate => sub {
1157 my $parser = new Pod::POM;
1158 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1159 1399
1160 $viewer->clear; 1400 $viewer->clear;
1161 1401
1162 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1163 for @{ CFClient::pod_to_pango_list $pom }; 1403 for @$pom;
1164 1404
1165 $viewer->set_offset (0); 1405 $viewer->set_offset (0);
1166 }, 1406 },
1407 on_visibility_change => sub {
1408 my ($self, $visible) = @_;
1409 return unless $visible;
1410 return if $self->{value};
1411 $self->set_value ("intro");
1412 },
1167 ); 1413 );
1168 }
1169
1170 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1171 1414
1172 $win 1415 $win
1173} 1416}
1174 1417
1175sub sdl_init { 1418sub sdl_init {
… …
1215 $DEBUG_STATUS->show; 1458 $DEBUG_STATUS->show;
1216 1459
1217 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1218 1461
1219 $STATUSBOX = new CFClient::UI::Statusbox; 1462 $STATUSBOX = new CFClient::UI::Statusbox;
1220 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1463 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1221 1464
1222 (new CFClient::UI::Frame 1465 (new CFClient::UI::Frame
1223 bg => [0, 0, 0, 0.4], 1466 bg => [0, 0, 0, 0.4],
1224 force_x => 0, 1467 force_x => 0,
1225 force_y => "max", 1468 force_y => "max",
1226 child => $STATUSBOX, 1469 child => $STATUSBOX,
1227 )->show; 1470 )->show;
1228 1471
1229 CFClient::UI::FancyFrame->new ( 1472 CFClient::UI::FancyFrame->new (
1230 title => "Mini Map", 1473 title => "Map",
1231 name => "mapmap", 1474 name => "mapmap",
1232 x => 0, 1475 x => 0,
1233 y => $FONTSIZE + 8, 1476 y => $FONTSIZE + 8,
1234 border_bg => [1, 1, 1, 192/255], 1477 border_bg => [1, 1, 1, 192/255],
1235 bg => [1, 1, 1, 0], 1478 bg => [1, 1, 1, 0],
… …
1252 } 1495 }
1253 }); 1496 });
1254 $MAPWIDGET->show; 1497 $MAPWIDGET->show;
1255 $MAPWIDGET->focus_in; 1498 $MAPWIDGET->focus_in;
1256 1499
1257 $LOGVIEW = new CFClient::UI::TextView 1500 $LOGVIEW = new CFClient::UI::TextScroller
1258 expand => 1, 1501 expand => 1,
1259 font => $FONT_FIXED, 1502 font => $FONT_FIXED,
1260 fontsize => $::CFG->{log_fontsize}, 1503 fontsize => $::CFG->{log_fontsize},
1504 indent => -4,
1261 can_hover => 1, 1505 can_hover => 1,
1262 can_events => 1, 1506 can_events => 1,
1263 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1507 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1264 ; 1508 ;
1265 1509
1510 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1511 title => "Setup",
1512 name => "setup_dialog",
1513 x => 'center',
1514 y => 'center',
1515 z => 2,
1516 force_w => $::WIDTH * 0.6,
1517 force_h => $::HEIGHT * 0.6,
1518 ;
1519
1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1522
1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1524 "Configure the server to play on, your username, password and other server-related options.");
1525 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1526 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1528 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1529 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1530 "Configure the use of audio, sound effects and background music.");
1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1532 "Lets you define, edit and delete bindings."
1533 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1534 . "with nothing set and the recording started. After doing the actions you "
1535 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1536 . "After pressing the combo the binding will be saved automatically and the "
1537 . "binding editor closes");
1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask.");
1542
1266 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1267 1544
1268 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1269 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1546 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1270 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1547
1271 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1272 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1548 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1273 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1274 1550
1275 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 1551 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
1276 1552
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1553 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1278 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1554 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1279 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1280 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1556 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1281 ."You can also hit the Tab-key to show/hide the Inventory."); 1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1282 1558
1283 $BUTTONBAR->add (new CFClient::UI::Button 1559 $BUTTONBAR->add (new CFClient::UI::Button
1284 text => "Save Config", 1560 text => "Save Config",
1285 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1561 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1286 on_activate => sub { 1562 on_activate => sub {
… …
1288 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1289 status "Configuration Saved"; 1565 status "Configuration Saved";
1290 }, 1566 },
1291 ); 1567 );
1292 1568
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1294 tooltip => "View Documentation"); 1570 tooltip => "View Documentation");
1295
1296 $BUTTONBAR->add (new CFClient::UI::Flopper
1297 text => "Bindings",
1298 other => make_binding_window,
1299 tooltip =>
1300 "Lets you define, edit and delete bindings."
1301 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1302 ."with nothing set and the recording started. After doing the actions you "
1303 ."want to record press Insert and you will be asked to press a key-combo."
1304 ."After pressing the combo the binding will be saved automatically and the "
1305 ."binding editor closes");
1306
1307 $BUTTONBAR->add (new CFClient::UI::Flopper
1308 text => "Spells",
1309 other => make_spell_list,
1310 tooltip => "The spell list");
1311
1312 $BUTTONBAR->add (new CFClient::UI::Flopper
1313 text => "Pickup",
1314 other => make_pickup_cfg_window,
1315 tooltip => "The pickup dialog");
1316
1317 1571
1318 $BUTTONBAR->add (new CFClient::UI::Button 1572 $BUTTONBAR->add (new CFClient::UI::Button
1319 text => "Quit", 1573 text => "Quit",
1320 tooltip => "Terminates the program", 1574 tooltip => "Terminates the program",
1321 on_activate => sub { 1575 on_activate => sub {
… …
1326 } 1580 }
1327 }, 1581 },
1328 ); 1582 );
1329 1583
1330 $BUTTONBAR->show; 1584 $BUTTONBAR->show;
1331 $SERVER_SETUP->show; 1585 $SETUP_DIALOG->show;
1332
1333 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1334 } 1586 }
1587
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1335} 1589}
1336 1590
1337sub video_shutdown { 1591sub video_shutdown {
1338 undef $SDL_ACTIVE; 1592 undef $SDL_ACTIVE;
1339} 1593}
… …
1471}; 1725};
1472 1726
1473 CFClient::SDL_GL_SwapBuffers; 1727 CFClient::SDL_GL_SwapBuffers;
1474} 1728}
1475 1729
1476my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1730my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1477 $NOW = time; 1731 $NOW = time;
1478 1732
1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1733 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1480 for CFClient::SDL_PollEvent; 1734 for CFClient::SDL_PollEvent;
1481 1735
… …
1548############################################################################# 1802#############################################################################
1549 1803
1550$SIG{INT} = $SIG{TERM} = sub { exit }; 1804$SIG{INT} = $SIG{TERM} = sub { exit };
1551 1805
1552{ 1806{
1553 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1807 local $SIG{__DIE__} = sub {
1808 return unless defined $^S && !$^S;
1809 Carp::confess $_[1];#d#TODO: remove when stable
1810 CFClient::fatal $_[0];
1811 };
1554 1812
1555 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1556 CFClient::UI::set_layout ($::CFG->{layout}); 1814 CFClient::UI::set_layout ($::CFG->{layout});
1557 1815
1558 my %DEF_CFG = ( 1816 my %DEF_CFG = (
… …
1564 map_scale => 1, 1822 map_scale => 1,
1565 fow_enable => 1, 1823 fow_enable => 1,
1566 fow_intensity => 0.45, 1824 fow_intensity => 0.45,
1567 fow_smooth => 0, 1825 fow_smooth => 0,
1568 gui_fontsize => 1, 1826 gui_fontsize => 1,
1569 log_fontsize => 1, 1827 log_fontsize => 0.7,
1570 gauge_fontsize=> 1, 1828 gauge_fontsize=> 1,
1571 gauge_size => 0.35, 1829 gauge_size => 0.35,
1572 stat_fontsize => 1, 1830 stat_fontsize => 0.7,
1573 mapsize => 100, 1831 mapsize => 100,
1574 host => "crossfire.schmorp.de", 1832 host => "crossfire.schmorp.de",
1575 say_command => 'say', 1833 say_command => 'say',
1576 audio_enable => 1, 1834 audio_enable => 1,
1577 bgm_enable => 1, 1835 bgm_enable => 1,
1578 bgm_volume => 0.25, 1836 bgm_volume => 0.25,
1579 face_prefetch => 0, 1837 face_prefetch => 0,
1580 output_sync => 1, 1838 output_sync => 1,
1581 output_count => 1, 1839 output_count => 1,
1840 pickup => 0,
1582 ); 1841 );
1583 1842
1584 while (my ($k, $v) = each %DEF_CFG) { 1843 while (my ($k, $v) = each %DEF_CFG) {
1585 $CFG->{$k} = $v unless exists $CFG->{$k}; 1844 $CFG->{$k} = $v unless exists $CFG->{$k};
1586 } 1845 }

Diff Legend

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