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.37 by elmex, Wed May 31 10:15:34 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
… …
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});
… …
438 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
439 626
440 $win 627 $win
441} 628}
442 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
443 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
444sub make_stats_window { 658sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
447 x => "max", 661 x => "max",
448 title => "Stats", 662 title => "Stats",
449 name => "stats_window"; 663 name => "stats_window";
… …
553 update_stats_window ({}); 767 update_stats_window ({});
554 768
555 $tgw 769 $tgw
556} 770}
557 771
558sub formsep { 772sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 774}
561 775
562sub update_stats_window { 776sub update_stats_window {
563 my ($stats) = @_; 777 my ($stats) = @_;
564 778
… …
626 840
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 842 for keys %tbl;
629} 843}
630 844
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; 845my $METASERVER_ATIME;
642 846
643sub update_metaserver { 847sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 848 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 849 $METASERVER_ATIME = time + 60;
648 850
649 my $table = $METASERVER->{table}; 851 my $table = $METASERVER->{table};
650 $table->clear; 852 $table->clear;
… …
671 873
672 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
673 875
674 $table->clear; 876 $table->clear;
675 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 );
676 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
677 $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[$_])
678 for 0 .. $#col; 890 for 0 .. $#col;
679 891
680 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
681 893
682 my $y = 0; 894 my $y = 0;
683 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) {
… …
700 912
701 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
702 914
703 $y++; 915 $y++;
704 916
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
706 (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 {
707 $HOST->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
923 $METASERVER->hide;
924 },
708 }), 925 ),
709 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
710 ]); 927 ]);
711 928
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
713 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)
714 for 0 .. $#$m; 937 for 0 .. $#$m;
715 } 938 }
716 } 939 }
717 }); 940 });
718} 941}
719 942
943sub metaserver_dialog {
944 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List",
946 name => 'metaserver_dialog',
947 x => 'center',
948 y => 'center',
949 z => 3,
950 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox),
952 on_visibility_change => sub {
953 update_metaserver if $_[1];
954 },
955 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960
961 $dialog
962}
963
720sub server_setup { 964sub 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), 965 my $vbox = new CFClient::UI::VBox;
727 ;
728 966
729 $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]);
730 $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");
731 969
732 { 970 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 972
735 $vbox->add ( 973 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 974 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 975 expand => 1,
738 text => $CFG->{host}, 976 text => $CFG->{host},
739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740 on_changed => sub { 978 on_changed => sub {
741 my ($self, $value) = @_; 979 my ($self, $value) = @_;
… …
743 } 981 }
744 ); 982 );
745 983
746 $METASERVER = metaserver_dialog; 984 $METASERVER = metaserver_dialog;
747 985
748 $vbox->add (new CFClient::UI::Flopper 986 $vbox->add (new CFClient::UI::Button
749 expand => 1, 987 expand => 1,
750 text => "Server List", 988 text => "Server List",
751 other => $METASERVER, 989 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 991 on_activate => sub { $METASERVER->toggle_visibility },
754 update_metaserver $HOST; 992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 }
756 ); 993 );
757 } 994 }
758 995
759 $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");
760 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
827 $CONN ? stop_game 1064 $CONN ? stop_game
828 : start_game; 1065 : start_game;
829 }, 1066 },
830 ); 1067 );
831 1068
832 $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
833} 1082}
834 1083
835sub message_window { 1084sub message_window {
836 my $window = new CFClient::UI::FancyFrame 1085 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 1086 name => "message_window",
838 title => "Messages", 1087 title => "Messages",
839 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
840 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
841 x => "max", 1090 x => "max",
842 y => 0, 1091 y => 0,
843 force_w => $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
844 force_h => $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
845 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
846 1095
847 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
848 1097
849 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
863 }, 1112 },
864 on_activate => sub { 1113 on_activate => sub {
865 my ($input, $text) = @_; 1114 my ($input, $text) = @_;
866 $input->set_text (''); 1115 $input->set_text ('');
867 1116
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 =~ /^\/(.*)/) { 1117 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 1118 $::CONN->user_send ($1);
875 } else { 1119 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 1120 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 1121 $::CONN->user_send ("$say_cmd $text");
878 } 1122 }
… …
897sub open_quit_dialog { 1141sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 1142 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 1144 x => "center",
901 y => "center", 1145 y => "center",
1146 z => 50,
902 title => "Really Quit?", 1147 title => "Really Quit?",
903 ; 1148 ;
904 1149
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 1151
… …
923 } 1168 }
924 1169
925 $QUIT_DIALOG->show; 1170 $QUIT_DIALOG->show;
926} 1171}
927 1172
1173sub autopickup_setup {
1174 my $table = new CFClient::UI::Table;
1175
1176 for (
1177 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG],
1182 ],
1183 ["Weapons", 0, 6,
1184 ["All weapons" => PICKUP_ALLWEAPON],
1185 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1186 ["Bows" => PICKUP_BOW],
1187 ["Arrows" => PICKUP_ARROW],
1188 ],
1189 ["Armour", 0, 12,
1190 ["Helmets" => PICKUP_HELMET],
1191 ["Shields" => PICKUP_SHIELD],
1192 ["Body Armour" => PICKUP_ARMOUR],
1193 ["Boots" => PICKUP_BOOTS],
1194 ["Gloves" => PICKUP_GLOVES],
1195 ["Cloaks" => PICKUP_CLOAK],
1196 ],
1197
1198 ["Readables", 2, 2,
1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1202 ],
1203 ["Misc", 2, 7,
1204 ["Food" => PICKUP_FOOD],
1205 ["Drinks" => PICKUP_DRINK],
1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1207 ["Keys" => PICKUP_KEY],
1208 ["Magical Items" => PICKUP_MAGICAL],
1209 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS],
1213 ],
1214 )
1215 {
1216 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218
1219 for (@bits) {
1220 ++$y;
1221
1222 my $mask = $_->[1];
1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1225 state => $CFG->{pickup} & $mask,
1226 on_changed => sub {
1227 my ($box, $value) = @_;
1228
1229 if ($value) {
1230 $::CFG->{pickup} |= $mask;
1231 } else {
1232 $::CFG->{pickup} &= ~$mask;
1233 }
1234
1235 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN;
1237 });
1238 }
1239 }
1240
1241 $table
1242}
1243
928sub make_inventory_window { 1244sub inventory_window {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1246 x => "center",
931 y => "center", 1247 y => "center",
932 force_w => $WIDTH * 9/10, 1248 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1249 force_h => $HEIGHT * 9/10,
… …
950 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
951 1267
952 $invwin 1268 $invwin
953} 1269}
954 1270
955sub make_binding_window { 1271sub spell_setup {
1272 new CFClient::UI::SpellList
1273}
1274
1275sub keyboard_setup {
956 my $binding_list = new CFClient::UI::VBox; 1276 my $binding_list = new CFClient::UI::VBox;
957 1277
958 my $refresh; 1278 my $refresh;
959 $refresh = sub { 1279 $refresh = sub {
960 $binding_list->clear (); 1280 $binding_list->clear ();
… …
984 sub { 1304 sub {
985 my ($nmod, $nsym, $ncmds) = @_; 1305 my ($nmod, $nsym, $ncmds) = @_;
986 delete $::CFG->{bindings}->{$mod}->{$sym}; 1306 delete $::CFG->{bindings}->{$mod}->{$sym};
987 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
988 $refresh->(); 1308 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
989 $::BIND_WINDOW->show; 1310 $SETUP_DIALOG->show;
990 }, 1311 },
991 sub { 1312 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
992 $::BIND_WINDOW->show; 1314 $SETUP_DIALOG->show;
993 }); 1315 });
994 $::BIND_EDITOR->show; 1316 $::BIND_EDITOR->show;
995 $::BIND_WINDOW->hide; 1317 $SETUP_DIALOG->hide;
996 }); 1318 });
997 1319
998 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
999 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1000 } 1322 }
1001 } 1323 }
1002 }; 1324 };
1003 1325
1004 $BIND_WINDOW = new CFClient::UI::FancyFrame
1005 title => "Bindings",
1006 x => "center",
1007 y => "center",
1008 def_w => int $WIDTH * 9/10,
1009 def_h => int $HEIGHT * 9/10,
1010 on_visibility_change => sub {
1011 my ($self, $visible) = @_;
1012 $refresh->() if $visible;
1013 };
1014
1015 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1326 my $vb = new CFClient::UI::VBox;
1016 $vb->add ($binding_list); 1327 $vb->add ($binding_list);
1017 $vb->add (my $hb = new CFClient::UI::HBox); 1328 $vb->add (my $hb = new CFClient::UI::HBox);
1329
1018 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1019 text => "record new", 1331 text => "record new",
1020 expand => 1, 1332 expand => 1,
1021 tooltip => "This button opens the binding editor with an empty binding.", 1333 tooltip => "This button opens the binding editor with an empty binding.",
1022 on_activate => sub { 1334 on_activate => sub {
1023 $::BIND_EDITOR->set_binding (undef, undef, [], 1335 $::BIND_EDITOR->set_binding (undef, undef, [],
1024 sub { 1336 sub {
1025 my ($mod, $sym, $cmds) = @_; 1337 my ($mod, $sym, $cmds) = @_;
1026 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1027 $refresh->(); 1339 $refresh->();
1028 $::BIND_WINDOW->show; 1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show;
1029 }, 1342 },
1030 sub { 1343 sub {
1031 $::BIND_WINDOW->show; 1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show;
1032 }); 1346 },
1033 $::BIND_WINDOW->hide; 1347 );
1348 $SETUP_DIALOG->hide;
1034 $::BIND_EDITOR->show; 1349 $::BIND_EDITOR->show;
1035 }, 1350 },
1036 ); 1351 );
1352
1037 $hb->add (new CFClient::UI::Button 1353 $hb->add (new CFClient::UI::Button
1038 text => "close", 1354 text => "close",
1039 tooltip => "Closes the binding window", 1355 tooltip => "Closes the binding window",
1040 expand => 1, 1356 expand => 1,
1041 on_activate => sub { 1357 on_activate => sub {
1042 $::BIND_WINDOW->hide; 1358 $SETUP_DIALOG->hide;
1043 } 1359 }
1044 ); 1360 );
1045 1361
1046 $refresh->(); 1362 $refresh->();
1047 $BIND_WINDOW
1048}
1049 1363
1364 $vb
1365}
1366
1050sub make_help_window { 1367sub help_window {
1051 my $win = new CFClient::UI::FancyFrame 1368 my $win = new CFClient::UI::FancyFrame
1369 x => 'center',
1370 y => 'center',
1371 z => 2,
1372 name => 'doc_browser',
1052 def_w => int $WIDTH * 7/8, 1373 force_w => int $WIDTH * 7/8,
1053 def_h => int $HEIGHT * 7/8, 1374 force_h => int $HEIGHT * 7/8,
1054 title => "Documentation"; 1375 title => "Documentation";
1055 1376
1056 $win->add (my $vbox = new CFClient::UI::VBox); 1377 $win->add (my $vbox = new CFClient::UI::VBox);
1057 1378
1058 $vbox->add (my $buttons = new CFClient::UI::HBox); 1379 $vbox->add (my $buttons = new CFClient::UI::HBox);
1059 $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);
1060 1382
1061 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 => [
1062 [intro => "Introduction"], 1387 [intro => "Introduction"],
1063 [manual => "Manual"], 1388 [manual => "Manual"],
1389 [skill_help => "Skills"],
1064 [command_help => "Commands"], 1390 [command_help => "Commands"],
1065 [skill_help => "Skills"], 1391 [dmcommand_help => "DM Commands"],
1066 ) { 1392 [COPYING => "License Terms"],
1067 my ($pod, $label) = @$_; 1393 ],
1394 on_changed => sub {
1395 my ($self, $pod) = @_;
1068 1396
1069 $buttons->add (new CFClient::UI::Button 1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1070 text => $label, 1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1071 on_activate => sub {
1072 my $parser = new Pod::POM;
1073 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1074 1399
1075 $viewer->clear; 1400 $viewer->clear;
1076 1401
1077 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1078 for @{ CFClient::pod_to_pango_list $pom }; 1403 for @$pom;
1079 1404
1080 $viewer->set_offset (0); 1405 $viewer->set_offset (0);
1081 }, 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 },
1082 ); 1413 );
1083 }
1084
1085 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1086 1414
1087 $win 1415 $win
1088} 1416}
1089 1417
1090sub sdl_init { 1418sub sdl_init {
… …
1130 $DEBUG_STATUS->show; 1458 $DEBUG_STATUS->show;
1131 1459
1132 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1133 1461
1134 $STATUSBOX = new CFClient::UI::Statusbox; 1462 $STATUSBOX = new CFClient::UI::Statusbox;
1135 $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]);
1136 1464
1137 (new CFClient::UI::Frame 1465 (new CFClient::UI::Frame
1138 bg => [0, 0, 0, 0.4], 1466 bg => [0, 0, 0, 0.4],
1139 force_x => 0, 1467 force_x => 0,
1140 force_y => "max", 1468 force_y => "max",
1141 child => $STATUSBOX, 1469 child => $STATUSBOX,
1142 )->show; 1470 )->show;
1143 1471
1144 CFClient::UI::FancyFrame->new ( 1472 CFClient::UI::FancyFrame->new (
1473 title => "Map",
1474 name => "mapmap",
1145 x => 0, 1475 x => 0,
1146 y => $FONTSIZE + 8, 1476 y => $FONTSIZE + 8,
1147 border_bg => [1, 1, 1, 192/255], 1477 border_bg => [1, 1, 1, 192/255],
1148 bg => [1, 1, 1, 0], 1478 bg => [1, 1, 1, 0],
1149 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1479 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1165 } 1495 }
1166 }); 1496 });
1167 $MAPWIDGET->show; 1497 $MAPWIDGET->show;
1168 $MAPWIDGET->focus_in; 1498 $MAPWIDGET->focus_in;
1169 1499
1170 $LOGVIEW = new CFClient::UI::TextView 1500 $LOGVIEW = new CFClient::UI::TextScroller
1171 expand => 1, 1501 expand => 1,
1172 font => $FONT_FIXED, 1502 font => $FONT_FIXED,
1173 fontsize => $::CFG->{log_fontsize}, 1503 fontsize => $::CFG->{log_fontsize},
1504 indent => -4,
1174 can_hover => 1, 1505 can_hover => 1,
1175 can_events => 1, 1506 can_events => 1,
1176 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.",
1177 ; 1508 ;
1178 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
1179 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1180 1544
1181 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1182 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.");
1183 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1547
1184 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1185 $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,
1186 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.");
1187 1550
1188 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
1189 1552
1190 $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,
1191 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.");
1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1193 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 :). "
1194 ."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.");
1195 1558
1196 $BUTTONBAR->add (new CFClient::UI::Button 1559 $BUTTONBAR->add (new CFClient::UI::Button
1197 text => "Save Config", 1560 text => "Save Config",
1198 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.",
1199 on_activate => sub { 1562 on_activate => sub {
… …
1201 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1202 status "Configuration Saved"; 1565 status "Configuration Saved";
1203 }, 1566 },
1204 ); 1567 );
1205 1568
1206 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1207 tooltip => "View Documentation"); 1570 tooltip => "View Documentation");
1208
1209 $BUTTONBAR->add (new CFClient::UI::Flopper
1210 text => "Bindings",
1211 other => make_binding_window,
1212 tooltip =>
1213 "Lets you define, edit and delete bindings."
1214 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1215 ."with nothing set and the recording started. After doing the actions you "
1216 ."want to record press Insert and you will be asked to press a key-combo."
1217 ."After pressing the combo the binding will be saved automatically and the "
1218 ."binding editor closes"
1219 );
1220 1571
1221 $BUTTONBAR->add (new CFClient::UI::Button 1572 $BUTTONBAR->add (new CFClient::UI::Button
1222 text => "Quit", 1573 text => "Quit",
1223 tooltip => "Terminates the program", 1574 tooltip => "Terminates the program",
1224 on_activate => sub { 1575 on_activate => sub {
… …
1229 } 1580 }
1230 }, 1581 },
1231 ); 1582 );
1232 1583
1233 $BUTTONBAR->show; 1584 $BUTTONBAR->show;
1234 $SERVER_SETUP->show; 1585 $SETUP_DIALOG->show;
1235
1236 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1237 } 1586 }
1587
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1238} 1589}
1239 1590
1240sub video_shutdown { 1591sub video_shutdown {
1241 undef $SDL_ACTIVE; 1592 undef $SDL_ACTIVE;
1242} 1593}
… …
1374}; 1725};
1375 1726
1376 CFClient::SDL_GL_SwapBuffers; 1727 CFClient::SDL_GL_SwapBuffers;
1377} 1728}
1378 1729
1379my $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 {
1380 $NOW = time; 1731 $NOW = time;
1381 1732
1382 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1733 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1383 for CFClient::SDL_PollEvent; 1734 for CFClient::SDL_PollEvent;
1384 1735
… …
1451############################################################################# 1802#############################################################################
1452 1803
1453$SIG{INT} = $SIG{TERM} = sub { exit }; 1804$SIG{INT} = $SIG{TERM} = sub { exit };
1454 1805
1455{ 1806{
1456 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 };
1457 1812
1458 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1459 CFClient::UI::set_layout ($::CFG->{layout}); 1814 CFClient::UI::set_layout ($::CFG->{layout});
1460 1815
1461 my %DEF_CFG = ( 1816 my %DEF_CFG = (
… …
1467 map_scale => 1, 1822 map_scale => 1,
1468 fow_enable => 1, 1823 fow_enable => 1,
1469 fow_intensity => 0.45, 1824 fow_intensity => 0.45,
1470 fow_smooth => 0, 1825 fow_smooth => 0,
1471 gui_fontsize => 1, 1826 gui_fontsize => 1,
1472 log_fontsize => 1, 1827 log_fontsize => 0.7,
1473 gauge_fontsize=> 1, 1828 gauge_fontsize=> 1,
1474 gauge_size => 0.35, 1829 gauge_size => 0.35,
1475 stat_fontsize => 1, 1830 stat_fontsize => 0.7,
1476 mapsize => 100, 1831 mapsize => 100,
1477 host => "crossfire.schmorp.de", 1832 host => "crossfire.schmorp.de",
1478 say_command => 'say', 1833 say_command => 'say',
1479 audio_enable => 1, 1834 audio_enable => 1,
1480 bgm_enable => 1, 1835 bgm_enable => 1,
1481 bgm_volume => 0.25, 1836 bgm_volume => 0.25,
1482 face_prefetch => 0, 1837 face_prefetch => 0,
1483 output_sync => 1, 1838 output_sync => 1,
1484 output_count => 1, 1839 output_count => 1,
1840 pickup => 0,
1485 ); 1841 );
1486 1842
1487 while (my ($k, $v) = each %DEF_CFG) { 1843 while (my ($k, $v) = each %DEF_CFG) {
1488 $CFG->{$k} = $v unless exists $CFG->{$k}; 1844 $CFG->{$k} = $v unless exists $CFG->{$k};
1489 } 1845 }
… …
1552=head1 USAGE 1908=head1 USAGE
1553 1909
1554cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1910cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1555fullscreen and interactively. 1911fullscreen and interactively.
1556 1912
1913=head1 DEBUGGING
1914
1915
1916CFPLUS_DEBUG - environment variable
1917
1918 1 draw borders around widgets
1919 2 add low-level widget info to tooltips
1920 4 show fps
1921 8 suppress tooltips
1922
1557=head1 AUTHOR 1923=head1 AUTHOR
1558 1924
1559Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1925Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1560 1926
1561 1927

Diff Legend

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