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.38 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.67 by root, Sun Jun 11 18:36:15 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
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;
110 120
111our $SPELL_LIST; 121our $PICKUP_CFG;
112 122
113sub status { 123sub status {
114 $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]);
115} 125}
116 126
117sub debug { 127sub debug {
118 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
119} 129}
120 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
121sub start_game { 312sub start_game {
122 status "logging in..."; 313 status "logging in...";
123 314
124 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
126 317
127 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;
128 319
129 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
130 321
… …
142 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
143 logview => $LOGVIEW, 334 logview => $LOGVIEW,
144 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
145 map => $MAP, 336 map => $MAP,
146 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
147 339
148 sound_play => sub { 340 sound_play => sub {
149 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
150 342
151 $SDL_MIXER 343 $SDL_MIXER
… …
168 } 360 }
169} 361}
170 362
171sub stop_game { 363sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
174 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
175 $LOGVIEW->hide;
176 368
177 return unless $CONN; 369 return unless $CONN;
178 370
179 status "connection closed"; 371 status "connection closed";
180 372
373 destroy_query_dialog $CONN;
181 $CONN->destroy; 374 $CONN->destroy;
182 $CONN = 0; # false, does not autovivify 375 $CONN = 0; # false, does not autovivify
183} 376}
184 377
185sub client_setup { 378sub graphics_setup {
186 my $dialog = new CFClient::UI::FancyFrame
187 x => 1,
188 y => $HEIGHT * (1/8),
189 name => "client_setup",
190 title => "Client Setup",
191 child => (my $vbox = new CFClient::UI::VBox); 379 my $vbox = new CFClient::UI::VBox;
192 380
193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 381 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
194 382
195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 383 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 384 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
320 on_activate => sub { 508 on_activate => sub {
321 video_shutdown (); 509 video_shutdown ();
322 video_init (); 510 video_init ();
323 } 511 }
324 ); 512 );
513
514 $vbox
515}
516
517sub audio_setup {
518 my $vbox = new CFClient::UI::VBox;
519
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
521
522 my $row = 0;
325 523
326 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
327 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
328 state => $CFG->{audio_enable}, 526 state => $CFG->{audio_enable},
329 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
360 audio_shutdown (); 558 audio_shutdown ();
361 audio_init (); 559 audio_init ();
362 } 560 }
363 ); 561 );
364 562
365 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $vbox
366 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
367 text => $CFG->{say_command},
368 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. "
369 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
370 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
371 on_changed => sub {
372 my ($self, $value) = @_;
373 $CFG->{say_command} = $value;
374 }
375 );
376
377 $dialog
378} 564}
379 565
380sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
440 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
441 627
442 $win 628 $win
443} 629}
444 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
445 633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
446sub make_stats_window { 659sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 661 y => $HEIGHT * (2/8),
449 x => "max", 662 x => "max",
450 title => "Stats", 663 title => "Stats",
451 name => "stats_window"; 664 name => "stats_window";
… …
555 update_stats_window ({}); 768 update_stats_window ({});
556 769
557 $tgw 770 $tgw
558} 771}
559 772
560sub formsep { 773sub formsep($) {
561 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 775}
563 776
564sub update_stats_window { 777sub update_stats_window {
565 my ($stats) = @_; 778 my ($stats) = @_;
566 779
… …
628 841
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 843 for keys %tbl;
631} 844}
632 845
633sub metaserver_dialog {
634 my $dialog = new CFClient::UI::FancyFrame
635 title => "Server List",
636 child => (my $vbox = new CFClient::UI::VBox);
637
638 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
639
640 $dialog
641}
642
643my $METASERVER_ATIME; 846my $METASERVER_ATIME;
644 847
645sub update_metaserver { 848sub update_metaserver {
646 my ($HOST) = @_;
647
648 return if $METASERVER_ATIME > time; 849 return if $METASERVER_ATIME > time;
649 $METASERVER_ATIME = time + 60; 850 $METASERVER_ATIME = time + 60;
650 851
651 my $table = $METASERVER->{table}; 852 my $table = $METASERVER->{table};
652 $table->clear; 853 $table->clear;
… …
673 874
674 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
675 876
676 $table->clear; 877 $table->clear;
677 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
678 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
679 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
680 for 0 .. $#col; 891 for 0 .. $#col;
681 892
682 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
683 894
684 my $y = 0; 895 my $y = 0;
685 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
702 913
703 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
704 915
705 $y++; 916 $y++;
706 917
707 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
708 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
709 $HOST->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
924 $METASERVER->hide;
925 },
710 }), 926 ),
711 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
712 ]); 928 ]);
713 929
714 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
715 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
716 for 0 .. $#$m; 938 for 0 .. $#$m;
717 } 939 }
718 } 940 }
719 }); 941 });
720} 942}
721 943
944sub metaserver_dialog {
945 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List",
947 name => 'metaserver_dialog',
948 x => 'center',
949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox),
953 on_visibility_change => sub {
954 update_metaserver if $_[1];
955 },
956 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962 $dialog
963}
964
722sub server_setup { 965sub server_setup {
723 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
724 x => "center",
725 y => "center",
726 name => "server_setup",
727 title => "Server Setup",
728 child => (my $vbox = new CFClient::UI::VBox), 966 my $vbox = new CFClient::UI::VBox;
729 ;
730 967
731 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 968 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
732 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 969 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
733 970
734 { 971 {
735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
736 973
737 $vbox->add ( 974 $vbox->add (
738 my $HOST = new CFClient::UI::Entry 975 $HOST_ENTRY = new CFClient::UI::Entry
739 expand => 1, 976 expand => 1,
740 text => $CFG->{host}, 977 text => $CFG->{host},
741 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
742 on_changed => sub { 979 on_changed => sub {
743 my ($self, $value) = @_; 980 my ($self, $value) = @_;
… …
745 } 982 }
746 ); 983 );
747 984
748 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
749 986
750 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
751 expand => 1, 988 expand => 1,
752 text => "Server List", 989 text => "Server List",
753 other => $METASERVER, 990 other => $METASERVER,
754 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
755 on_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility },
756 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
757 }
758 ); 994 );
759 } 995 }
760 996
761 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
762 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
829 $CONN ? stop_game 1065 $CONN ? stop_game
830 : start_game; 1066 : start_game;
831 }, 1067 },
832 ); 1068 );
833 1069
834 $dialog 1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1072 text => $CFG->{say_command},
1073 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub {
1077 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value;
1079 }
1080 );
1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
835} 1092}
836 1093
837sub message_window { 1094sub message_window {
838 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
839 name => "message_window", 1096 name => "message_window",
840 title => "Messages", 1097 title => "Messages",
841 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
842 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
843 x => "max", 1100 x => "max",
844 y => 0, 1101 y => 0,
845 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
846 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
847 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
848 1105
849 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
850 1107
851 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
865 }, 1122 },
866 on_activate => sub { 1123 on_activate => sub {
867 my ($input, $text) = @_; 1124 my ($input, $text) = @_;
868 $input->set_text (''); 1125 $input->set_text ('');
869 1126
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
875 } elsif ($text =~ /^\/(.*)/) { 1127 if ($text =~ /^\/(.*)/) {
876 $::CONN->user_send ($1); 1128 $::CONN->user_send ($1);
877 } else { 1129 } else {
878 my $say_cmd = $::CFG->{say_command} || 'say'; 1130 my $say_cmd = $::CFG->{say_command} || 'say';
879 $::CONN->user_send ("$say_cmd $text"); 1131 $::CONN->user_send ("$say_cmd $text");
880 } 1132 }
… …
899sub open_quit_dialog { 1151sub open_quit_dialog {
900 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
901 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center", 1154 x => "center",
903 y => "center", 1155 y => "center",
1156 z => 50,
904 title => "Really Quit?", 1157 title => "Really Quit?",
905 ; 1158 ;
906 1159
907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
908 1161
… …
925 } 1178 }
926 1179
927 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
928} 1181}
929 1182
1183sub autopickup_setup {
1184 my $table = new CFClient::UI::Table;
1185
1186 for (
1187 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
1193 ["Weapons", 0, 6,
1194 ["All weapons" => PICKUP_ALLWEAPON],
1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1196 ["Bows" => PICKUP_BOW],
1197 ["Arrows" => PICKUP_ARROW],
1198 ],
1199 ["Armour", 0, 12,
1200 ["Helmets" => PICKUP_HELMET],
1201 ["Shields" => PICKUP_SHIELD],
1202 ["Body Armour" => PICKUP_ARMOUR],
1203 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
1208 ["Readables", 2, 2,
1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
1213 ["Misc", 2, 7,
1214 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
1225 )
1226 {
1227 my ($title, $x, $y, @bits) = @$_;
1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1229
1230 for (@bits) {
1231 ++$y;
1232
1233 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask,
1237 on_changed => sub {
1238 my ($box, $value) = @_;
1239
1240 if ($value) {
1241 $::CFG->{pickup} |= $mask;
1242 } else {
1243 $::CFG->{pickup} &= ~$mask;
1244 }
1245
1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN;
1248 });
1249 }
1250 }
1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
930sub make_inventory_window { 1274sub inventory_window {
931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
932 x => "center", 1276 x => "center",
933 y => "center", 1277 y => "center",
934 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
935 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
… …
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953 1297
954 $invwin 1298 $invwin
955} 1299}
956 1300
957sub make_spell_list { 1301sub spell_setup {
958 $SPELL_LIST = new CFClient::UI::SpellList 1302 new CFClient::UI::SpellList
959 force_w => $WIDTH * (9/10),
960 force_h => $HEIGHT * (9/10);
961 $SPELL_LIST
962} 1303}
963 1304
964sub make_binding_window { 1305sub keyboard_setup {
965 my $binding_list = new CFClient::UI::VBox; 1306 my $binding_list = new CFClient::UI::VBox;
966 1307
967 my $refresh; 1308 my $refresh;
968 $refresh = sub { 1309 $refresh = sub {
969 $binding_list->clear (); 1310 $binding_list->clear ();
… …
993 sub { 1334 sub {
994 my ($nmod, $nsym, $ncmds) = @_; 1335 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym}; 1336 delete $::CFG->{bindings}->{$mod}->{$sym};
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
997 $refresh->(); 1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
998 $::BIND_WINDOW->show; 1340 $SETUP_DIALOG->show;
999 }, 1341 },
1000 sub { 1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1001 $::BIND_WINDOW->show; 1344 $SETUP_DIALOG->show;
1002 }); 1345 });
1003 $::BIND_EDITOR->show; 1346 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide; 1347 $SETUP_DIALOG->hide;
1005 }); 1348 });
1006 1349
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 } 1352 }
1010 } 1353 }
1011 }; 1354 };
1012 1355
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame
1014 title => "Bindings",
1015 x => "center",
1016 y => "center",
1017 def_w => int $WIDTH * 9/10,
1018 def_h => int $HEIGHT * 9/10,
1019 on_visibility_change => sub {
1020 my ($self, $visible) = @_;
1021 $refresh->() if $visible;
1022 };
1023
1024 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1356 my $vb = new CFClient::UI::VBox;
1025 $vb->add ($binding_list); 1357 $vb->add ($binding_list);
1026 $vb->add (my $hb = new CFClient::UI::HBox); 1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359
1027 $hb->add (new CFClient::UI::Button 1360 $hb->add (new CFClient::UI::Button
1028 text => "record new", 1361 text => "record new",
1029 expand => 1, 1362 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.", 1363 tooltip => "This button opens the binding editor with an empty binding.",
1031 on_activate => sub { 1364 on_activate => sub {
1032 $::BIND_EDITOR->set_binding (undef, undef, [], 1365 $::BIND_EDITOR->set_binding (undef, undef, [],
1033 sub { 1366 sub {
1034 my ($mod, $sym, $cmds) = @_; 1367 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1036 $refresh->(); 1369 $refresh->();
1037 $::BIND_WINDOW->show; 1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show;
1038 }, 1372 },
1039 sub { 1373 sub {
1040 $::BIND_WINDOW->show; 1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1375 $SETUP_DIALOG->show;
1041 }); 1376 },
1042 $::BIND_WINDOW->hide; 1377 );
1378 $SETUP_DIALOG->hide;
1043 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1044 }, 1380 },
1045 ); 1381 );
1382
1046 $hb->add (new CFClient::UI::Button 1383 $hb->add (new CFClient::UI::Button
1047 text => "close", 1384 text => "close",
1048 tooltip => "Closes the binding window", 1385 tooltip => "Closes the binding window",
1049 expand => 1, 1386 expand => 1,
1050 on_activate => sub { 1387 on_activate => sub {
1051 $::BIND_WINDOW->hide; 1388 $SETUP_DIALOG->hide;
1052 } 1389 }
1053 ); 1390 );
1054 1391
1055 $refresh->(); 1392 $refresh->();
1056 $BIND_WINDOW
1057}
1058 1393
1394 $vb
1395}
1396
1059sub make_help_window { 1397sub help_window {
1060 my $win = new CFClient::UI::FancyFrame 1398 my $win = new CFClient::UI::FancyFrame
1399 x => 'center',
1400 y => 'center',
1401 z => 2,
1402 name => 'doc_browser',
1061 def_w => int $WIDTH * 7/8, 1403 force_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8, 1404 force_h => int $HEIGHT * 7/8,
1063 title => "Documentation"; 1405 title => "Documentation";
1064 1406
1065 $win->add (my $vbox = new CFClient::UI::VBox); 1407 $win->add (my $vbox = new CFClient::UI::VBox);
1066 1408
1067 $vbox->add (my $buttons = new CFClient::UI::HBox); 1409 $vbox->add (my $buttons = new CFClient::UI::HBox);
1068 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4);
1069 1412
1070 for ( 1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef,
1416 options => [
1071 [intro => "Introduction"], 1417 [intro => "Introduction"],
1072 [manual => "Manual"], 1418 [manual => "Manual"],
1419 [skill_help => "Skills"],
1073 [command_help => "Commands"], 1420 [command_help => "Commands"],
1074 [skill_help => "Skills"], 1421 [dmcommand_help => "DM Commands"],
1075 ) { 1422 [COPYING => "License Terms"],
1076 my ($pod, $label) = @$_; 1423 ],
1424 on_changed => sub {
1425 my ($self, $pod) = @_;
1077 1426
1078 $buttons->add (new CFClient::UI::Button 1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1079 text => $label, 1428 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1080 on_activate => sub {
1081 my $parser = new Pod::POM;
1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1083 1429
1084 $viewer->clear; 1430 $viewer->clear;
1085 1431
1086 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1087 for @{ CFClient::pod_to_pango_list $pom }; 1433 for @$pom;
1088 1434
1089 $viewer->set_offset (0); 1435 $viewer->set_offset (0);
1090 }, 1436 },
1437 on_visibility_change => sub {
1438 my ($self, $visible) = @_;
1439 return unless $visible;
1440 return if $self->{value};
1441 $self->set_value ("intro");
1442 },
1091 ); 1443 );
1092 }
1093
1094 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1095 1444
1096 $win 1445 $win
1097} 1446}
1098 1447
1099sub sdl_init { 1448sub sdl_init {
… …
1139 $DEBUG_STATUS->show; 1488 $DEBUG_STATUS->show;
1140 1489
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142 1491
1143 $STATUSBOX = new CFClient::UI::Statusbox; 1492 $STATUSBOX = new CFClient::UI::Statusbox;
1144 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1145 1494
1146 (new CFClient::UI::Frame 1495 (new CFClient::UI::Frame
1147 bg => [0, 0, 0, 0.4], 1496 bg => [0, 0, 0, 0.4],
1148 force_x => 0, 1497 force_x => 0,
1149 force_y => "max", 1498 force_y => "max",
1150 child => $STATUSBOX, 1499 child => $STATUSBOX,
1151 )->show; 1500 )->show;
1152 1501
1153 CFClient::UI::FancyFrame->new ( 1502 CFClient::UI::FancyFrame->new (
1503 title => "Map",
1504 name => "mapmap",
1154 x => 0, 1505 x => 0,
1155 y => $FONTSIZE + 8, 1506 y => $FONTSIZE + 8,
1156 border_bg => [1, 1, 1, 192/255], 1507 border_bg => [1, 1, 1, 192/255],
1157 bg => [1, 1, 1, 0], 1508 bg => [1, 1, 1, 0],
1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1509 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1174 } 1525 }
1175 }); 1526 });
1176 $MAPWIDGET->show; 1527 $MAPWIDGET->show;
1177 $MAPWIDGET->focus_in; 1528 $MAPWIDGET->focus_in;
1178 1529
1179 $LOGVIEW = new CFClient::UI::TextView 1530 $LOGVIEW = new CFClient::UI::TextScroller
1180 expand => 1, 1531 expand => 1,
1181 font => $FONT_FIXED, 1532 font => $FONT_FIXED,
1182 fontsize => $::CFG->{log_fontsize}, 1533 fontsize => $::CFG->{log_fontsize},
1534 indent => -4,
1183 can_hover => 1, 1535 can_hover => 1,
1184 can_events => 1, 1536 can_events => 1,
1185 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1537 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1186 ; 1538 ;
1187 1539
1540 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1541 title => "Setup",
1542 name => "setup_dialog",
1543 x => 'center',
1544 y => 'center',
1545 z => 2,
1546 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6,
1548 ;
1549
1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1554 "Configure the server to play on, your username, password and other server-related options.");
1555 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1556 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask.");
1572
1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1189 1574
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1191 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1576 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1577
1193 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1194 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1578 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1195 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1196 1580
1197 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1581 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1198 1582
1199 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1200 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1201 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1202 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1203 ."You can also hit the Tab-key to show/hide the Inventory."); 1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1204 1588
1205 $BUTTONBAR->add (new CFClient::UI::Button 1589 $BUTTONBAR->add (new CFClient::UI::Button
1206 text => "Save Config", 1590 text => "Save Config",
1207 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1591 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1208 on_activate => sub { 1592 on_activate => sub {
… …
1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1211 status "Configuration Saved"; 1595 status "Configuration Saved";
1212 }, 1596 },
1213 ); 1597 );
1214 1598
1215 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1216 tooltip => "View Documentation"); 1600 tooltip => "View Documentation");
1217
1218 $BUTTONBAR->add (new CFClient::UI::Flopper
1219 text => "Bindings",
1220 other => make_binding_window,
1221 tooltip =>
1222 "Lets you define, edit and delete bindings."
1223 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1224 ."with nothing set and the recording started. After doing the actions you "
1225 ."want to record press Insert and you will be asked to press a key-combo."
1226 ."After pressing the combo the binding will be saved automatically and the "
1227 ."binding editor closes");
1228
1229 $BUTTONBAR->add (new CFClient::UI::Flopper
1230 text => "Spells",
1231 other => make_spell_list,
1232 tooltip => "The spell list");
1233 1601
1234 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1235 text => "Quit", 1603 text => "Quit",
1236 tooltip => "Terminates the program", 1604 tooltip => "Terminates the program",
1237 on_activate => sub { 1605 on_activate => sub {
… …
1242 } 1610 }
1243 }, 1611 },
1244 ); 1612 );
1245 1613
1246 $BUTTONBAR->show; 1614 $BUTTONBAR->show;
1247 $SERVER_SETUP->show; 1615 $SETUP_DIALOG->show;
1248
1249 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1250 } 1616 }
1617
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1251} 1619}
1252 1620
1253sub video_shutdown { 1621sub video_shutdown {
1254 undef $SDL_ACTIVE; 1622 undef $SDL_ACTIVE;
1255} 1623}
… …
1387}; 1755};
1388 1756
1389 CFClient::SDL_GL_SwapBuffers; 1757 CFClient::SDL_GL_SwapBuffers;
1390} 1758}
1391 1759
1392my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1760my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1393 $NOW = time; 1761 $NOW = time;
1394 1762
1395 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1763 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1396 for CFClient::SDL_PollEvent; 1764 for CFClient::SDL_PollEvent;
1397 1765
… …
1464############################################################################# 1832#############################################################################
1465 1833
1466$SIG{INT} = $SIG{TERM} = sub { exit }; 1834$SIG{INT} = $SIG{TERM} = sub { exit };
1467 1835
1468{ 1836{
1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1837 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable
1840 CFClient::fatal $_[0];
1841 };
1470 1842
1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout}); 1844 CFClient::UI::set_layout ($::CFG->{layout});
1473 1845
1474 my %DEF_CFG = ( 1846 my %DEF_CFG = (
… …
1480 map_scale => 1, 1852 map_scale => 1,
1481 fow_enable => 1, 1853 fow_enable => 1,
1482 fow_intensity => 0.45, 1854 fow_intensity => 0.45,
1483 fow_smooth => 0, 1855 fow_smooth => 0,
1484 gui_fontsize => 1, 1856 gui_fontsize => 1,
1485 log_fontsize => 1, 1857 log_fontsize => 0.7,
1486 gauge_fontsize=> 1, 1858 gauge_fontsize=> 1,
1487 gauge_size => 0.35, 1859 gauge_size => 0.35,
1488 stat_fontsize => 1, 1860 stat_fontsize => 0.7,
1489 mapsize => 100, 1861 mapsize => 100,
1490 host => "crossfire.schmorp.de", 1862 host => "crossfire.schmorp.de",
1491 say_command => 'say', 1863 say_command => 'say',
1492 audio_enable => 1, 1864 audio_enable => 1,
1493 bgm_enable => 1, 1865 bgm_enable => 1,
1494 bgm_volume => 0.25, 1866 bgm_volume => 0.25,
1495 face_prefetch => 0, 1867 face_prefetch => 0,
1496 output_sync => 1, 1868 output_sync => 1,
1497 output_count => 1, 1869 output_count => 1,
1870 pickup => 0,
1498 ); 1871 );
1499 1872
1500 while (my ($k, $v) = each %DEF_CFG) { 1873 while (my ($k, $v) = each %DEF_CFG) {
1501 $CFG->{$k} = $v unless exists $CFG->{$k}; 1874 $CFG->{$k} = $v unless exists $CFG->{$k};
1502 } 1875 }
… …
1565=head1 USAGE 1938=head1 USAGE
1566 1939
1567cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1940cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1568fullscreen and interactively. 1941fullscreen and interactively.
1569 1942
1943=head1 DEBUGGING
1944
1945
1946CFPLUS_DEBUG - environment variable
1947
1948 1 draw borders around widgets
1949 2 add low-level widget info to tooltips
1950 4 show fps
1951 8 suppress tooltips
1952
1570=head1 AUTHOR 1953=head1 AUTHOR
1571 1954
1572Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1955Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1573 1956
1574 1957

Diff Legend

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