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.68 by elmex, Mon Jun 12 12:28:06 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;
89our $SERVER_INFO;
87 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
88our $FLOORBOX; 99our $FLOORBOX;
89our $GAUGES; 100our $GAUGES;
90our $STATWIDS; 101our $STATWIDS;
91 102
92our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
103our $INV_WINDOW; 114our $INV_WINDOW;
104our $INV; 115our $INV;
105our $INVR; 116our $INVR;
106our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
107 118
108our $BIND_WINDOW;
109our $BIND_EDITOR; 119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
110 122
111sub status { 123sub status {
112 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
113} 125}
114 126
115sub debug { 127sub debug {
116 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
117} 129}
118 130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 }
161 );
162 $hbox->add (new CFClient::UI::Button
163 text => "Yes",
164 on_activate => sub {
165 $conn->send ("reply y");
166 destroy_query_dialog $conn;
167 },
168 );
169
170 $dialog->focus_in;
171
172 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show;
177
178 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4,
180 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n";
182
183 unshift @dialog, my $table = new CFClient::UI::Table;
184
185 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race",
187 on_activate => sub {
188 $conn->send ("reply n");
189 destroy_query_dialog $conn;
190 },
191 );
192 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept",
194 on_activate => sub {
195 $conn->send ("reply d");
196 destroy_query_dialog $conn;
197 },
198 );
199
200 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, "
210 . "so you can take your time making this important choice."
211 ;
212
213 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat");
216 destroy_query_dialog $conn;
217 return;
218 }
219
220 $STATS_WINDOW->show;
221 $MESSAGE_WINDOW->hide;
222
223 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4,
225 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n";
227
228 unshift @dialog, my $table = new CFClient::UI::Table;
229
230 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again",
233 on_activate => sub {
234 $conn->send ("reply y");
235 destroy_query_dialog $conn;
236 },
237 );
238
239 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
241 value => $_,
242 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
246 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
247 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
248 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250 ],
251 ), 1 .. 2;
252
253 $table->add (2, 0, new CFClient::UI::Button
254 text => "Swap Stats",
255 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn;
259 },
260 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262
263 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept",
266 on_activate => sub {
267 $conn->send ("reply n");
268 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn;
270 },
271 );
272
273 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4,
275 ellipsise => 0,
276 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats "
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281 . "Race selection will influence those values later on."
282 ;
283 }
284
285 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub {
287 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn;
289 },
290 ;
291
292 $entry->focus_in;
293
294 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296
297 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub {
300 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn;
302 },
303 ;
304
305 $entry->focus_in;
306 }
307
308 $vbox->add (@dialog);
309 $dialog->show;
310}
311
119sub start_game { 312sub start_game {
120 status "logging in..."; 313 status "logging in...";
121 314
122 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
124 317
125 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
126 319
127 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
128 321
… …
140 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
141 logview => $LOGVIEW, 334 logview => $LOGVIEW,
142 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
143 map => $MAP, 336 map => $MAP,
144 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
145 339
146 sound_play => sub { 340 sound_play => sub {
147 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
148 342
149 $SDL_MIXER 343 $SDL_MIXER
… …
166 } 360 }
167} 361}
168 362
169sub stop_game { 363sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
172 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
173 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
174 369
175 return unless $CONN; 370 return unless $CONN;
176 371
177 status "connection closed"; 372 status "connection closed";
178 373
374 destroy_query_dialog $CONN;
179 $CONN->destroy; 375 $CONN->destroy;
180 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
181} 377}
182 378
183sub client_setup { 379sub 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); 380 my $vbox = new CFClient::UI::VBox;
190 381
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 382 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 383
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 384 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
318 on_activate => sub { 509 on_activate => sub {
319 video_shutdown (); 510 video_shutdown ();
320 video_init (); 511 video_init ();
321 } 512 }
322 ); 513 );
514
515 $vbox
516}
517
518sub audio_setup {
519 my $vbox = new CFClient::UI::VBox;
520
521 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
522
523 my $row = 0;
323 524
324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 527 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.", 528 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
358 audio_shutdown (); 559 audio_shutdown ();
359 audio_init (); 560 audio_init ();
360 } 561 }
361 ); 562 );
362 563
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $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} 565}
377 566
378sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
438 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
439 628
440 $win 629 $win
441} 630}
442 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
443 634
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
643
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645
646 for my $x (0..2) {
647 for my $y (0 .. 2) {
648 $table->add ($x + 3, $y,
649 new CFClient::UI::Entry
650 text => $default_smooth[$x * 3 + $y],
651 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652 );
653 }
654 }
655
656
657 $table
658}
659
444sub make_stats_window { 660sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
447 x => "max", 663 x => "max",
448 title => "Stats", 664 title => "Stats",
449 name => "stats_window"; 665 name => "stats_window";
… …
553 update_stats_window ({}); 769 update_stats_window ({});
554 770
555 $tgw 771 $tgw
556} 772}
557 773
558sub formsep { 774sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 776}
561 777
562sub update_stats_window { 778sub update_stats_window {
563 my ($stats) = @_; 779 my ($stats) = @_;
564 780
… …
626 842
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 844 for keys %tbl;
629} 845}
630 846
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; 847my $METASERVER_ATIME;
642 848
643sub update_metaserver { 849sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
648 852
649 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
650 $table->clear; 854 $table->clear;
… …
671 875
672 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
673 877
674 $table->clear; 878 $table->clear;
675 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
676 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
677 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
678 for 0 .. $#col; 892 for 0 .. $#col;
679 893
680 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
681 895
682 my $y = 0; 896 my $y = 0;
683 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
700 914
701 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
702 916
703 $y++; 917 $y++;
704 918
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
925 $METASERVER->hide;
926 },
708 }), 927 ),
709 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
710 ]); 929 ]);
711 930
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
713 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 932 ellipsise => 0,
933 align => $align[$_],
934 text => $m->[$_],
935 tooltip => $tip[$_],
936 can_hover => 1,
937 can_events => 1,
938 fontsize => 0.8)
714 for 0 .. $#$m; 939 for 0 .. $#$m;
715 } 940 }
716 } 941 }
717 }); 942 });
718} 943}
719 944
945sub metaserver_dialog {
946 my $dialog = new CFClient::UI::FancyFrame
947 title => "Server List",
948 name => 'metaserver_dialog',
949 x => 'center',
950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
953 child => (my $vbox = new CFClient::UI::VBox),
954 on_visibility_change => sub {
955 update_metaserver if $_[1];
956 },
957 ;
958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog
964}
965
720sub server_setup { 966sub 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), 967 my $vbox = new CFClient::UI::VBox;
727 ;
728 968
729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
731 971
732 { 972 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 974
735 $vbox->add ( 975 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 976 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 977 expand => 1,
738 text => $CFG->{host}, 978 text => $CFG->{host},
739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740 on_changed => sub { 980 on_changed => sub {
741 my ($self, $value) = @_; 981 my ($self, $value) = @_;
… …
743 } 983 }
744 ); 984 );
745 985
746 $METASERVER = metaserver_dialog; 986 $METASERVER = metaserver_dialog;
747 987
748 $vbox->add (new CFClient::UI::Flopper 988 $vbox->add (new CFClient::UI::Button
749 expand => 1, 989 expand => 1,
750 text => "Server List", 990 text => "Server List",
751 other => $METASERVER, 991 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 993 on_activate => sub { $METASERVER->toggle_visibility },
754 update_metaserver $HOST; 994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755 }
756 ); 995 );
757 } 996 }
758 997
759 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
760 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
827 $CONN ? stop_game 1066 $CONN ? stop_game
828 : start_game; 1067 : start_game;
829 }, 1068 },
830 ); 1069 );
831 1070
832 $dialog 1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 text => $CFG->{say_command},
1074 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub {
1078 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value;
1080 }
1081 );
1082
1083 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info",
1085 fontsize => 1.2,
1086 padding_y => 8,
1087 fg => [1, 1, 0, 1],
1088 );
1089
1090 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1091
1092 $vbox
833} 1093}
834 1094
835sub message_window { 1095sub message_window {
836 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 1097 name => "message_window",
838 title => "Messages", 1098 title => "Messages",
839 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
840 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
841 x => "max", 1101 x => "max",
842 y => 0, 1102 y => 0,
843 force_w => $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
844 force_h => $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
845 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
846 1106
847 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
848 1108
849 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
863 }, 1123 },
864 on_activate => sub { 1124 on_activate => sub {
865 my ($input, $text) = @_; 1125 my ($input, $text) = @_;
866 $input->set_text (''); 1126 $input->set_text ('');
867 1127
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 =~ /^\/(.*)/) { 1128 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 1129 $::CONN->user_send ($1);
875 } else { 1130 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 1131 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 1132 $::CONN->user_send ("$say_cmd $text");
878 } 1133 }
… …
897sub open_quit_dialog { 1152sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 1155 x => "center",
901 y => "center", 1156 y => "center",
1157 z => 50,
902 title => "Really Quit?", 1158 title => "Really Quit?",
903 ; 1159 ;
904 1160
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 1162
… …
923 } 1179 }
924 1180
925 $QUIT_DIALOG->show; 1181 $QUIT_DIALOG->show;
926} 1182}
927 1183
1184sub autopickup_setup {
1185 my $table = new CFClient::UI::Table;
1186
1187 for (
1188 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG],
1193 ],
1194 ["Weapons", 0, 6,
1195 ["All weapons" => PICKUP_ALLWEAPON],
1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1197 ["Bows" => PICKUP_BOW],
1198 ["Arrows" => PICKUP_ARROW],
1199 ],
1200 ["Armour", 0, 12,
1201 ["Helmets" => PICKUP_HELMET],
1202 ["Shields" => PICKUP_SHIELD],
1203 ["Body Armour" => PICKUP_ARMOUR],
1204 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK],
1207 ],
1208
1209 ["Readables", 2, 2,
1210 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ],
1214 ["Misc", 2, 7,
1215 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
1226 )
1227 {
1228 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230
1231 for (@bits) {
1232 ++$y;
1233
1234 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask,
1238 on_changed => sub {
1239 my ($box, $value) = @_;
1240
1241 if ($value) {
1242 $::CFG->{pickup} |= $mask;
1243 } else {
1244 $::CFG->{pickup} &= ~$mask;
1245 }
1246
1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN;
1249 });
1250 }
1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 1;
1270 });
1271
1272 $table
1273}
1274
928sub make_inventory_window { 1275sub inventory_window {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1277 x => "center",
931 y => "center", 1278 y => "center",
932 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
934 title => "Inventory", 1281 title => "Inventory",
935 name => "inventory_window",
936 ; 1282 ;
937 1283
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1285
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1298
953 $invwin 1299 $invwin
954} 1300}
955 1301
956sub make_binding_window { 1302sub spell_setup {
1303 new CFClient::UI::SpellList
1304}
1305
1306sub keyboard_setup {
957 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
958 1308
959 my $refresh; 1309 my $refresh;
960 $refresh = sub { 1310 $refresh = sub {
961 $binding_list->clear (); 1311 $binding_list->clear ();
… …
985 sub { 1335 sub {
986 my ($nmod, $nsym, $ncmds) = @_; 1336 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym}; 1337 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->(); 1339 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
990 $::BIND_WINDOW->show; 1341 $SETUP_DIALOG->show;
991 }, 1342 },
992 sub { 1343 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
993 $::BIND_WINDOW->show; 1345 $SETUP_DIALOG->show;
994 }); 1346 });
995 $::BIND_EDITOR->show; 1347 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide; 1348 $SETUP_DIALOG->hide;
997 }); 1349 });
998 1350
999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1001 } 1353 }
1002 } 1354 }
1003 }; 1355 };
1004 1356
1005 $BIND_WINDOW = new CFClient::UI::FancyFrame 1357 my $vb = new CFClient::UI::VBox;
1006 title => "Bindings", 1358 $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); 1359 $vb->add (my $hb = new CFClient::UI::HBox);
1360
1017 $vb->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
1018 text => "record new", 1362 text => "record new",
1363 expand => 1,
1019 tooltip => "This button opens the binding editor with an empty binding.", 1364 tooltip => "This button opens the binding editor with an empty binding.",
1020 on_activate => sub { 1365 on_activate => sub {
1021 $::BIND_EDITOR->set_binding (undef, undef, [], 1366 $::BIND_EDITOR->set_binding (undef, undef, [],
1022 sub { 1367 sub {
1023 my ($mod, $sym, $cmds) = @_; 1368 my ($mod, $sym, $cmds) = @_;
1024 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1025 $refresh->(); 1370 $refresh->();
1026 $::BIND_WINDOW->show; 1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show;
1027 }, 1373 },
1028 sub { 1374 sub {
1029 $::BIND_WINDOW->show; 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1030 }); 1377 },
1031 $::BIND_WINDOW->hide; 1378 );
1379 $SETUP_DIALOG->hide;
1032 $::BIND_EDITOR->show; 1380 $::BIND_EDITOR->show;
1033 }, 1381 },
1034 ); 1382 );
1035 $vb->add ($binding_list); 1383
1384 $hb->add (new CFClient::UI::Button
1385 text => "close",
1386 tooltip => "Closes the binding window",
1387 expand => 1,
1388 on_activate => sub {
1389 $SETUP_DIALOG->hide;
1390 }
1391 );
1392
1036 $refresh->(); 1393 $refresh->();
1037 $BIND_WINDOW
1038}
1039 1394
1395 $vb
1396}
1397
1040sub make_help_window { 1398sub help_window {
1041 my $win = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
1400 x => 'center',
1401 y => 'center',
1402 z => 2,
1403 name => 'doc_browser',
1042 def_w => int $WIDTH * 7/8, 1404 force_w => int $WIDTH * 7/8,
1043 def_h => int $HEIGHT * 7/8, 1405 force_h => int $HEIGHT * 7/8,
1044 title => "Documentation"; 1406 title => "Documentation";
1045 1407
1046 $win->add (my $vbox = new CFClient::UI::VBox); 1408 $win->add (my $vbox = new CFClient::UI::VBox);
1047 1409
1048 $vbox->add (my $buttons = new CFClient::UI::HBox); 1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
1049 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4);
1050 1413
1051 for ( 1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox
1416 value => undef,
1417 options => [
1052 [intro => "Introduction"], 1418 [intro => "Introduction"],
1053 [manual => "Manual"], 1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
1054 [command_help => "Commands"], 1421 [command_help => "Commands"],
1055 [skill_help => "Skills"], 1422 [dmcommand_help => "DM Commands"],
1056 ) { 1423 [COPYING => "License Terms"],
1057 my ($pod, $label) = @$_; 1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1058 1427
1059 $buttons->add (new CFClient::UI::Button 1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1060 text => $label, 1429 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 1430
1065 $viewer->clear; 1431 $viewer->clear;
1066 1432
1067 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1068 for @{ CFClient::pod_to_pango_list $pom }; 1434 for @$pom;
1069 1435
1070 $viewer->set_offset (0); 1436 $viewer->set_offset (0);
1071 }, 1437 },
1438 on_visibility_change => sub {
1439 my ($self, $visible) = @_;
1440 return unless $visible;
1441 return if $self->{value};
1442 $self->set_value ("intro");
1443 },
1072 ); 1444 );
1073 }
1074
1075 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1076 1445
1077 $win 1446 $win
1078} 1447}
1079 1448
1080sub sdl_init { 1449sub sdl_init {
… …
1120 $DEBUG_STATUS->show; 1489 $DEBUG_STATUS->show;
1121 1490
1122 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1123 1492
1124 $STATUSBOX = new CFClient::UI::Statusbox; 1493 $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]); 1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1126 1495
1127 (new CFClient::UI::Frame 1496 (new CFClient::UI::Frame
1128 bg => [0, 0, 0, 0.4], 1497 bg => [0, 0, 0, 0.4],
1129 force_x => 0, 1498 force_x => 0,
1130 force_y => "max", 1499 force_y => "max",
1131 child => $STATUSBOX, 1500 child => $STATUSBOX,
1132 )->show; 1501 )->show;
1133 1502
1134 CFClient::UI::FancyFrame->new ( 1503 CFClient::UI::FancyFrame->new (
1504 title => "Map",
1505 name => "mapmap",
1135 x => 0, 1506 x => 0,
1136 y => $FONTSIZE + 8, 1507 y => $FONTSIZE + 8,
1137 border_bg => [1, 1, 1, 192/255], 1508 border_bg => [1, 1, 1, 192/255],
1138 bg => [1, 1, 1, 0], 1509 bg => [1, 1, 1, 0],
1139 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1510 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1155 } 1526 }
1156 }); 1527 });
1157 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1158 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1159 1530
1160 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1161 expand => 1, 1532 expand => 1,
1162 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1163 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1164 can_hover => 1, 1536 can_hover => 1,
1165 can_events => 1, 1537 can_events => 1,
1166 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1167 ; 1539 ;
1168 1540
1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1542 title => "Setup",
1543 name => "setup_dialog",
1544 x => 'center',
1545 y => 'center',
1546 z => 2,
1547 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6,
1549 ;
1550
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555 "Configure the server to play on, your username, password and other server-related options.");
1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask.");
1573
1169 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1170 1575
1171 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1576 $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."); 1577 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, 1578
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, 1579 $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."); 1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1177 1581
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 1582 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 1583
1180 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1584 $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."); 1585 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, 1586 $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 :)."); 1587 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1184 1589
1185 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1186 text => "Save Config", 1591 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.", 1592 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 { 1593 on_activate => sub {
… …
1190 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1191 status "Configuration Saved"; 1596 status "Configuration Saved";
1192 }, 1597 },
1193 ); 1598 );
1194 1599
1195 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1196 tooltip => "View Documentation"); 1601 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 1602
1204 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1205 text => "Quit", 1604 text => "Quit",
1206 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
1207 on_activate => sub { 1606 on_activate => sub {
… …
1212 } 1611 }
1213 }, 1612 },
1214 ); 1613 );
1215 1614
1216 $BUTTONBAR->show; 1615 $BUTTONBAR->show;
1217 $SERVER_SETUP->show; 1616 $SETUP_DIALOG->show;
1218
1219 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1220 } 1617 }
1618
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1221} 1620}
1222 1621
1223sub video_shutdown { 1622sub video_shutdown {
1224 undef $SDL_ACTIVE; 1623 undef $SDL_ACTIVE;
1225} 1624}
… …
1357}; 1756};
1358 1757
1359 CFClient::SDL_GL_SwapBuffers; 1758 CFClient::SDL_GL_SwapBuffers;
1360} 1759}
1361 1760
1362my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1363 $NOW = time; 1762 $NOW = time;
1364 1763
1365 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1764 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1366 for CFClient::SDL_PollEvent; 1765 for CFClient::SDL_PollEvent;
1367 1766
… …
1434############################################################################# 1833#############################################################################
1435 1834
1436$SIG{INT} = $SIG{TERM} = sub { exit }; 1835$SIG{INT} = $SIG{TERM} = sub { exit };
1437 1836
1438{ 1837{
1439 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1838 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable
1841 CFClient::fatal $_[0];
1842 };
1440 1843
1441 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1442 CFClient::UI::set_layout ($::CFG->{layout}); 1845 CFClient::UI::set_layout ($::CFG->{layout});
1443 1846
1444 my %DEF_CFG = ( 1847 my %DEF_CFG = (
… …
1450 map_scale => 1, 1853 map_scale => 1,
1451 fow_enable => 1, 1854 fow_enable => 1,
1452 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1453 fow_smooth => 0, 1856 fow_smooth => 0,
1454 gui_fontsize => 1, 1857 gui_fontsize => 1,
1455 log_fontsize => 1, 1858 log_fontsize => 0.7,
1456 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1457 gauge_size => 0.35, 1860 gauge_size => 0.35,
1458 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1459 mapsize => 100, 1862 mapsize => 100,
1460 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1461 say_command => 'say', 1864 say_command => 'say',
1462 audio_enable => 1, 1865 audio_enable => 1,
1463 bgm_enable => 1, 1866 bgm_enable => 1,
1464 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1465 face_prefetch => 0, 1868 face_prefetch => 0,
1466 output_sync => 1, 1869 output_sync => 1,
1467 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1468 ); 1872 );
1469 1873
1470 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1471 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1472 } 1876 }
… …
1535=head1 USAGE 1939=head1 USAGE
1536 1940
1537cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1941cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1538fullscreen and interactively. 1942fullscreen and interactively.
1539 1943
1944=head1 DEBUGGING
1945
1946
1947CFPLUS_DEBUG - environment variable
1948
1949 1 draw borders around widgets
1950 2 add low-level widget info to tooltips
1951 4 show fps
1952 8 suppress tooltips
1953
1540=head1 AUTHOR 1954=head1 AUTHOR
1541 1955
1542Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1956Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1543 1957
1544 1958

Diff Legend

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