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.34 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.64 by root, Wed Jun 7 06:28:30 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
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
87 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
88our $FLOORBOX; 98our $FLOORBOX;
89our $GAUGES; 99our $GAUGES;
90our $STATWIDS; 100our $STATWIDS;
91 101
92our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
103our $INV_WINDOW; 113our $INV_WINDOW;
104our $INV; 114our $INV;
105our $INVR; 115our $INVR;
106our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
107 117
108our $BIND_WINDOW;
109our $BIND_EDITOR; 118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
110 121
111sub status { 122sub status {
112 $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]);
113} 124}
114 125
115sub debug { 126sub debug {
116 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
117} 128}
118 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
119sub start_game { 311sub start_game {
120 status "logging in..."; 312 status "logging in...";
121 313
122 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
124 316
125 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;
126 318
127 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
128 320
… …
140 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
141 logview => $LOGVIEW, 333 logview => $LOGVIEW,
142 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
143 map => $MAP, 335 map => $MAP,
144 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
145 338
146 sound_play => sub { 339 sound_play => sub {
147 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
148 341
149 $SDL_MIXER 342 $SDL_MIXER
… …
166 } 359 }
167} 360}
168 361
169sub stop_game { 362sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
172 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
173 $LOGVIEW->hide;
174 367
175 return unless $CONN; 368 return unless $CONN;
176 369
177 status "connection closed"; 370 status "connection closed";
178 371
372 destroy_query_dialog $CONN;
179 $CONN->destroy; 373 $CONN->destroy;
180 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
181} 375}
182 376
183sub client_setup { 377sub graphics_setup {
184 my $dialog = new CFClient::UI::FancyFrame
185 x => 1,
186 y => $HEIGHT * (1/8),
187 name => "client_setup",
188 title => "Client Setup",
189 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
190 379
191 $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]);
192 381
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
318 on_activate => sub { 507 on_activate => sub {
319 video_shutdown (); 508 video_shutdown ();
320 video_init (); 509 video_init ();
321 } 510 }
322 ); 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;
323 522
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
327 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.",
… …
358 audio_shutdown (); 557 audio_shutdown ();
359 audio_init (); 558 audio_init ();
360 } 559 }
361 ); 560 );
362 561
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 563}
377 564
378sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 x => "max", 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
… …
553 update_stats_window ({}); 740 update_stats_window ({});
554 741
555 $tgw 742 $tgw
556} 743}
557 744
558sub formsep { 745sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 747}
561 748
562sub update_stats_window { 749sub update_stats_window {
563 my ($stats) = @_; 750 my ($stats) = @_;
564 751
… …
626 813
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 815 for keys %tbl;
629} 816}
630 817
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 818my $METASERVER_ATIME;
642 819
643sub update_metaserver { 820sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
648 823
649 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
650 $table->clear; 825 $table->clear;
… …
671 846
672 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
673 848
674 $table->clear; 849 $table->clear;
675 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
676 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
677 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
678 for 0 .. $#col; 863 for 0 .. $#col;
679 864
680 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
681 866
682 my $y = 0; 867 my $y = 0;
683 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
700 885
701 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
702 887
703 $y++; 888 $y++;
704 889
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
896 $METASERVER->hide;
897 },
708 }), 898 ),
709 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
710 ]); 900 ]);
711 901
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
713 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
714 for 0 .. $#$m; 910 for 0 .. $#$m;
715 } 911 }
716 } 912 }
717 }); 913 });
718} 914}
719 915
916sub metaserver_dialog {
917 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List",
919 name => 'metaserver_dialog',
920 x => 'center',
921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox),
925 on_visibility_change => sub {
926 update_metaserver if $_[1];
927 },
928 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933
934 $dialog
935}
936
720sub server_setup { 937sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
724 name => "server_setup",
725 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 938 my $vbox = new CFClient::UI::VBox;
727 ;
728 939
729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
731 942
732 { 943 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 945
735 $vbox->add ( 946 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 948 expand => 1,
738 text => $CFG->{host}, 949 text => $CFG->{host},
739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740 on_changed => sub { 951 on_changed => sub {
741 my ($self, $value) = @_; 952 my ($self, $value) = @_;
… …
743 } 954 }
744 ); 955 );
745 956
746 $METASERVER = metaserver_dialog; 957 $METASERVER = metaserver_dialog;
747 958
748 $vbox->add (new CFClient::UI::Flopper 959 $vbox->add (new CFClient::UI::Button
749 expand => 1, 960 expand => 1,
750 text => "Server List", 961 text => "Server List",
751 other => $METASERVER, 962 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 964 on_activate => sub { $METASERVER->toggle_visibility },
754 update_metaserver $HOST; 965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 }
756 ); 966 );
757 } 967 }
758 968
759 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
760 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
827 $CONN ? stop_game 1037 $CONN ? stop_game
828 : start_game; 1038 : start_game;
829 }, 1039 },
830 ); 1040 );
831 1041
832 $dialog 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1044 text => $CFG->{say_command},
1045 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. "
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub {
1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value;
1051 }
1052 );
1053
1054 $vbox
833} 1055}
834 1056
835sub message_window { 1057sub message_window {
836 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 1059 name => "message_window",
838 title => "Messages", 1060 title => "Messages",
839 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
840 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
841 x => "max", 1063 x => "max",
842 y => 0, 1064 y => 0,
843 force_w => $::WIDTH / 3, 1065 force_w => $::WIDTH * 0.4,
844 force_h => $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
845 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
846 1068
847 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
848 1070
849 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
863 }, 1085 },
864 on_activate => sub { 1086 on_activate => sub {
865 my ($input, $text) = @_; 1087 my ($input, $text) = @_;
866 $input->set_text (''); 1088 $input->set_text ('');
867 1089
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
873 } elsif ($text =~ /^\/(.*)/) { 1090 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 1091 $::CONN->user_send ($1);
875 } else { 1092 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 1093 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 1094 $::CONN->user_send ("$say_cmd $text");
878 } 1095 }
… …
897sub open_quit_dialog { 1114sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 1117 x => "center",
901 y => "center", 1118 y => "center",
1119 z => 50,
902 title => "Really Quit?", 1120 title => "Really Quit?",
903 ; 1121 ;
904 1122
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 1124
… …
923 } 1141 }
924 1142
925 $QUIT_DIALOG->show; 1143 $QUIT_DIALOG->show;
926} 1144}
927 1145
1146sub autopickup_setup {
1147 my $table = new CFClient::UI::Table;
1148
1149 for (
1150 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG],
1155 ],
1156 ["Weapons", 0, 6,
1157 ["All weapons" => PICKUP_ALLWEAPON],
1158 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1159 ["Bows" => PICKUP_BOW],
1160 ["Arrows" => PICKUP_ARROW],
1161 ],
1162 ["Armour", 0, 12,
1163 ["Helmets" => PICKUP_HELMET],
1164 ["Shields" => PICKUP_SHIELD],
1165 ["Body Armour" => PICKUP_ARMOUR],
1166 ["Boots" => PICKUP_BOOTS],
1167 ["Gloves" => PICKUP_GLOVES],
1168 ["Cloaks" => PICKUP_CLOAK],
1169 ],
1170
1171 ["Readables", 2, 2,
1172 ["Spellbooks" => PICKUP_SPELLBOOK],
1173 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1174 ["Normal Books/Scrolls" => PICKUP_READABLES],
1175 ],
1176 ["Misc", 2, 7,
1177 ["Food" => PICKUP_FOOD],
1178 ["Drinks" => PICKUP_DRINK],
1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1180 ["Keys" => PICKUP_KEY],
1181 ["Magical Items" => PICKUP_MAGICAL],
1182 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS],
1186 ],
1187 )
1188 {
1189 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191
1192 for (@bits) {
1193 ++$y;
1194
1195 my $mask = $_->[1];
1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask,
1199 on_changed => sub {
1200 my ($box, $value) = @_;
1201
1202 if ($value) {
1203 $::CFG->{pickup} |= $mask;
1204 } else {
1205 $::CFG->{pickup} &= ~$mask;
1206 }
1207
1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN;
1210 });
1211 }
1212 }
1213
1214 $table
1215}
1216
928sub make_inventory_window { 1217sub inventory_window {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1219 x => "center",
931 y => "center", 1220 y => "center",
932 force_w => $WIDTH * 9/10, 1221 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1222 force_h => $HEIGHT * 9/10,
934 title => "Inventory", 1223 title => "Inventory",
935 name => "inventory_window",
936 ; 1224 ;
937 1225
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1227
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1228 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1240
953 $invwin 1241 $invwin
954} 1242}
955 1243
956sub make_binding_window { 1244sub spell_setup {
1245 new CFClient::UI::SpellList
1246}
1247
1248sub keyboard_setup {
957 my $binding_list = new CFClient::UI::VBox; 1249 my $binding_list = new CFClient::UI::VBox;
958 1250
959 my $refresh; 1251 my $refresh;
960 $refresh = sub { 1252 $refresh = sub {
961 $binding_list->clear (); 1253 $binding_list->clear ();
… …
985 sub { 1277 sub {
986 my ($nmod, $nsym, $ncmds) = @_; 1278 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym}; 1279 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->(); 1281 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
990 $::BIND_WINDOW->show; 1283 $SETUP_DIALOG->show;
991 }, 1284 },
992 sub { 1285 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
993 $::BIND_WINDOW->show; 1287 $SETUP_DIALOG->show;
994 }); 1288 });
995 $::BIND_EDITOR->show; 1289 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide; 1290 $SETUP_DIALOG->hide;
997 }); 1291 });
998 1292
999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1001 } 1295 }
1002 } 1296 }
1003 }; 1297 };
1004 1298
1005 $BIND_WINDOW = new CFClient::UI::FancyFrame 1299 my $vb = new CFClient::UI::VBox;
1006 title => "Bindings", 1300 $vb->add ($binding_list);
1007 x => "center",
1008 y => "center",
1009 def_w => int $WIDTH * 9/10,
1010 def_h => int $HEIGHT * 9/10,
1011 on_visibility_change => sub {
1012 my ($self, $visible) = @_;
1013 $refresh->() if $visible;
1014 };
1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1301 $vb->add (my $hb = new CFClient::UI::HBox);
1302
1017 $vb->add (new CFClient::UI::Button 1303 $hb->add (new CFClient::UI::Button
1018 text => "record new", 1304 text => "record new",
1305 expand => 1,
1019 tooltip => "This button opens the binding editor with an empty binding.", 1306 tooltip => "This button opens the binding editor with an empty binding.",
1020 on_activate => sub { 1307 on_activate => sub {
1021 $::BIND_EDITOR->set_binding (undef, undef, [], 1308 $::BIND_EDITOR->set_binding (undef, undef, [],
1022 sub { 1309 sub {
1023 my ($mod, $sym, $cmds) = @_; 1310 my ($mod, $sym, $cmds) = @_;
1024 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1025 $refresh->(); 1312 $refresh->();
1026 $::BIND_WINDOW->show; 1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show;
1027 }, 1315 },
1028 sub { 1316 sub {
1029 $::BIND_WINDOW->show; 1317 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1318 $SETUP_DIALOG->show;
1030 }); 1319 },
1031 $::BIND_WINDOW->hide; 1320 );
1321 $SETUP_DIALOG->hide;
1032 $::BIND_EDITOR->show; 1322 $::BIND_EDITOR->show;
1033 }, 1323 },
1034 ); 1324 );
1035 $vb->add ($binding_list); 1325
1326 $hb->add (new CFClient::UI::Button
1327 text => "close",
1328 tooltip => "Closes the binding window",
1329 expand => 1,
1330 on_activate => sub {
1331 $SETUP_DIALOG->hide;
1332 }
1333 );
1334
1036 $refresh->(); 1335 $refresh->();
1037 $BIND_WINDOW
1038}
1039 1336
1337 $vb
1338}
1339
1040sub make_help_window { 1340sub help_window {
1041 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
1342 x => 'center',
1343 y => 'center',
1344 z => 2,
1345 name => 'doc_browser',
1042 def_w => int $WIDTH * 7/8, 1346 force_w => int $WIDTH * 7/8,
1043 def_h => int $HEIGHT * 7/8, 1347 force_h => int $HEIGHT * 7/8,
1044 title => "Documentation"; 1348 title => "Documentation";
1045 1349
1046 $win->add (my $vbox = new CFClient::UI::VBox); 1350 $win->add (my $vbox = new CFClient::UI::VBox);
1047 1351
1048 $vbox->add (my $buttons = new CFClient::UI::HBox); 1352 $vbox->add (my $buttons = new CFClient::UI::HBox);
1049 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1353 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1354 expand => 1, fontsize => 0.8, padding_x => 4);
1050 1355
1051 for ( 1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox
1358 value => undef,
1359 options => [
1052 [intro => "Introduction"], 1360 [intro => "Introduction"],
1053 [manual => "Manual"], 1361 [manual => "Manual"],
1362 [skill_help => "Skills"],
1054 [command_help => "Commands"], 1363 [command_help => "Commands"],
1055 [skill_help => "Skills"], 1364 [dmcommand_help => "DM Commands"],
1056 ) { 1365 [COPYING => "License Terms"],
1057 my ($pod, $label) = @$_; 1366 ],
1367 on_changed => sub {
1368 my ($self, $pod) = @_;
1058 1369
1059 $buttons->add (new CFClient::UI::Button 1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1060 text => $label, 1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1061 on_activate => sub {
1062 my $parser = new Pod::POM;
1063 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1064 1372
1065 $viewer->clear; 1373 $viewer->clear;
1066 1374
1067 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1068 for @{ CFClient::pod_to_pango_list $pom }; 1376 for @$pom;
1069 1377
1070 $viewer->set_offset (0); 1378 $viewer->set_offset (0);
1071 }, 1379 },
1380 on_visibility_change => sub {
1381 my ($self, $visible) = @_;
1382 return unless $visible;
1383 return if $self->{value};
1384 $self->set_value ("intro");
1385 },
1072 ); 1386 );
1073 }
1074
1075 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1076 1387
1077 $win 1388 $win
1078} 1389}
1079 1390
1080sub sdl_init { 1391sub sdl_init {
… …
1120 $DEBUG_STATUS->show; 1431 $DEBUG_STATUS->show;
1121 1432
1122 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1433 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1123 1434
1124 $STATUSBOX = new CFClient::UI::Statusbox; 1435 $STATUSBOX = new CFClient::UI::Statusbox;
1125 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1436 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1126 1437
1127 (new CFClient::UI::Frame 1438 (new CFClient::UI::Frame
1128 bg => [0, 0, 0, 0.4], 1439 bg => [0, 0, 0, 0.4],
1129 force_x => 0, 1440 force_x => 0,
1130 force_y => "max", 1441 force_y => "max",
1131 child => $STATUSBOX, 1442 child => $STATUSBOX,
1132 )->show; 1443 )->show;
1133 1444
1134 CFClient::UI::FancyFrame->new ( 1445 CFClient::UI::FancyFrame->new (
1446 title => "Map",
1447 name => "mapmap",
1135 x => 0, 1448 x => 0,
1136 y => $FONTSIZE + 8, 1449 y => $FONTSIZE + 8,
1137 border_bg => [1, 1, 1, 192/255], 1450 border_bg => [1, 1, 1, 192/255],
1138 bg => [1, 1, 1, 0], 1451 bg => [1, 1, 1, 0],
1139 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1452 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1155 } 1468 }
1156 }); 1469 });
1157 $MAPWIDGET->show; 1470 $MAPWIDGET->show;
1158 $MAPWIDGET->focus_in; 1471 $MAPWIDGET->focus_in;
1159 1472
1160 $LOGVIEW = new CFClient::UI::TextView 1473 $LOGVIEW = new CFClient::UI::TextScroller
1161 expand => 1, 1474 expand => 1,
1162 font => $FONT_FIXED, 1475 font => $FONT_FIXED,
1163 fontsize => $::CFG->{log_fontsize}, 1476 fontsize => $::CFG->{log_fontsize},
1477 indent => -4,
1164 can_hover => 1, 1478 can_hover => 1,
1165 can_events => 1, 1479 can_events => 1,
1166 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1480 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1167 ; 1481 ;
1168 1482
1483 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1484 title => "Setup",
1485 name => "setup_dialog",
1486 x => 'center',
1487 y => 'center',
1488 z => 2,
1489 force_w => $::WIDTH * 0.6,
1490 force_h => $::HEIGHT * 0.6,
1491 ;
1492
1493 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1495
1496 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1497 "Configure the server to play on, your username, password and other server-related options.");
1498 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1499 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1501 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1502 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1503 "Configure the use of audio, sound effects and background music.");
1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1505 "Lets you define, edit and delete bindings."
1506 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1507 . "with nothing set and the recording started. After doing the actions you "
1508 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1509 . "After pressing the combo the binding will be saved automatically and the "
1510 . "binding editor closes");
1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1512 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1513
1169 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1514 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1170 1515
1171 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1172 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1517 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1173 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1518
1174 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1175 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1176 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1520 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1177 1521
1178 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 1522 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
1179 1523
1180 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1524 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1181 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1525 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1182 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1526 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1183 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1527 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1528 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1184 1529
1185 $BUTTONBAR->add (new CFClient::UI::Button 1530 $BUTTONBAR->add (new CFClient::UI::Button
1186 text => "Save Config", 1531 text => "Save Config",
1187 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1532 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1188 on_activate => sub { 1533 on_activate => sub {
… …
1190 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1191 status "Configuration Saved"; 1536 status "Configuration Saved";
1192 }, 1537 },
1193 ); 1538 );
1194 1539
1195 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1196 tooltip => "View Documentation"); 1541 tooltip => "View Documentation");
1197
1198 $BUTTONBAR->add (new CFClient::UI::Flopper
1199 text => "Bindings",
1200 other => make_binding_window,
1201 tooltip => "Lets you delete bindings you have made with the recorder"
1202 );
1203 1542
1204 $BUTTONBAR->add (new CFClient::UI::Button 1543 $BUTTONBAR->add (new CFClient::UI::Button
1205 text => "Quit", 1544 text => "Quit",
1206 tooltip => "Terminates the program", 1545 tooltip => "Terminates the program",
1207 on_activate => sub { 1546 on_activate => sub {
… …
1212 } 1551 }
1213 }, 1552 },
1214 ); 1553 );
1215 1554
1216 $BUTTONBAR->show; 1555 $BUTTONBAR->show;
1217 $SERVER_SETUP->show; 1556 $SETUP_DIALOG->show;
1218
1219 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1220 } 1557 }
1558
1559 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1221} 1560}
1222 1561
1223sub video_shutdown { 1562sub video_shutdown {
1224 undef $SDL_ACTIVE; 1563 undef $SDL_ACTIVE;
1225} 1564}
… …
1357}; 1696};
1358 1697
1359 CFClient::SDL_GL_SwapBuffers; 1698 CFClient::SDL_GL_SwapBuffers;
1360} 1699}
1361 1700
1362my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1701my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1363 $NOW = time; 1702 $NOW = time;
1364 1703
1365 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1704 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1366 for CFClient::SDL_PollEvent; 1705 for CFClient::SDL_PollEvent;
1367 1706
… …
1434############################################################################# 1773#############################################################################
1435 1774
1436$SIG{INT} = $SIG{TERM} = sub { exit }; 1775$SIG{INT} = $SIG{TERM} = sub { exit };
1437 1776
1438{ 1777{
1439 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1778 local $SIG{__DIE__} = sub {
1779 return unless defined $^S && !$^S;
1780 Carp::confess $_[1];#d#TODO: remove when stable
1781 CFClient::fatal $_[0];
1782 };
1440 1783
1441 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1784 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1442 CFClient::UI::set_layout ($::CFG->{layout}); 1785 CFClient::UI::set_layout ($::CFG->{layout});
1443 1786
1444 my %DEF_CFG = ( 1787 my %DEF_CFG = (
… …
1450 map_scale => 1, 1793 map_scale => 1,
1451 fow_enable => 1, 1794 fow_enable => 1,
1452 fow_intensity => 0.45, 1795 fow_intensity => 0.45,
1453 fow_smooth => 0, 1796 fow_smooth => 0,
1454 gui_fontsize => 1, 1797 gui_fontsize => 1,
1455 log_fontsize => 1, 1798 log_fontsize => 0.7,
1456 gauge_fontsize=> 1, 1799 gauge_fontsize=> 1,
1457 gauge_size => 0.35, 1800 gauge_size => 0.35,
1458 stat_fontsize => 1, 1801 stat_fontsize => 0.7,
1459 mapsize => 100, 1802 mapsize => 100,
1460 host => "crossfire.schmorp.de", 1803 host => "crossfire.schmorp.de",
1461 say_command => 'say', 1804 say_command => 'say',
1462 audio_enable => 1, 1805 audio_enable => 1,
1463 bgm_enable => 1, 1806 bgm_enable => 1,
1464 bgm_volume => 0.25, 1807 bgm_volume => 0.25,
1465 face_prefetch => 0, 1808 face_prefetch => 0,
1466 output_sync => 1, 1809 output_sync => 1,
1467 output_count => 1, 1810 output_count => 1,
1811 pickup => 0,
1468 ); 1812 );
1469 1813
1470 while (my ($k, $v) = each %DEF_CFG) { 1814 while (my ($k, $v) = each %DEF_CFG) {
1471 $CFG->{$k} = $v unless exists $CFG->{$k}; 1815 $CFG->{$k} = $v unless exists $CFG->{$k};
1472 } 1816 }
… …
1535=head1 USAGE 1879=head1 USAGE
1536 1880
1537cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1881cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1538fullscreen and interactively. 1882fullscreen and interactively.
1539 1883
1884=head1 DEBUGGING
1885
1886
1887CFPLUS_DEBUG - environment variable
1888
1889 1 draw borders around widgets
1890 2 add low-level widget info to tooltips
1891 4 show fps
1892 8 suppress tooltips
1893
1540=head1 AUTHOR 1894=head1 AUTHOR
1541 1895
1542Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1896Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1543 1897
1544 1898

Diff Legend

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