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.25 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 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;
… …
101our $DEBUG_STATUS; 111our $DEBUG_STATUS;
102 112
103our $INV_WINDOW; 113our $INV_WINDOW;
104our $INV; 114our $INV;
105our $INVR; 115our $INVR;
106our $INVR_LBL; 116our $INV_RIGHT_HB;
107 117
108our $BIND_WINDOW; 118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
109 121
110sub status { 122sub status {
111 $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]);
112} 124}
113 125
114sub debug { 126sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 128}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "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;
118} 309}
119 310
120sub start_game { 311sub start_game {
121 status "logging in..."; 312 status "logging in...";
122 313
123 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
125 316
126 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;
127 318
128 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
129 320
… …
141 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
142 logview => $LOGVIEW, 333 logview => $LOGVIEW,
143 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
144 map => $MAP, 335 map => $MAP,
145 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
146 338
147 sound_play => sub { 339 sound_play => sub {
148 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
149 341
150 $SDL_MIXER 342 $SDL_MIXER
… …
167 } 359 }
168} 360}
169 361
170sub stop_game { 362sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
174 $LOGVIEW->hide;
175 367
176 return unless $CONN; 368 return unless $CONN;
177 369
178 status "connection closed"; 370 status "connection closed";
179 371
372 destroy_query_dialog $CONN;
180 $CONN->destroy; 373 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
182} 375}
183 376
184sub client_setup { 377sub graphics_setup {
185 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1,
187 req_y => $HEIGHT * (1/8),
188 name => "client_setup",
189 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
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);
195 384
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 385 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 386 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
198 387
199 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 389 my ($self, $value) = @_;
201 390
… …
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});
… …
389 576
390sub make_gauge_window { 577sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 579
393 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
394 req_x => 0, 581 force_x => 0,
395 req_y => -1, 582 force_y => "max",
396 def_w => $WIDTH, 583 force_w => $WIDTH,
397 def_h => $gh, 584 force_h => $gh,
398 ); 585 );
399 586
400 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 588 children => [
402 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 req_x => -1, 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
450 637
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
553 update_stats_window ({}); 740 update_stats_window ({});
554 741
555 $tgw 742 $tgw
556} 743}
557 744
558sub formsep { 745sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 747}
561 748
562sub update_stats_window { 749sub update_stats_window {
563 my ($stats) = @_; 750 my ($stats) = @_;
564 751
… …
626 813
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 815 for keys %tbl;
629} 816}
630 817
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 818my $METASERVER_ATIME;
642 819
643sub update_metaserver { 820sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
648 823
649 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
650 $table->clear; 825 $table->clear;
… …
702 877
703 $y++; 878 $y++;
704 879
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 880 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 881 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 882 $HOST_ENTRY->set_text ($CFG->{host} = $host);
883 $METASERVER->toggle_visibility;
708 }), 884 }),
709 (new CFClient::UI::Empty expand => 1), 885 (new CFClient::UI::Empty expand => 1),
710 ]); 886 ]);
711 887
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 888 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 891 }
716 } 892 }
717 }); 893 });
718} 894}
719 895
720sub server_setup { 896sub metaserver_dialog {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 897 my $dialog = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 898 title => "Server List",
723 y => $HEIGHT * (1/8), 899 name => 'metaserver_dialog',
724 name => "server_setup", 900 x => 'center',
725 title => "Server Setup", 901 y => 'center',
902 z => 3,
726 child => (my $vbox = new CFClient::UI::VBox), 903 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub { 904 on_visibility_change => sub {
728 my ($self, $visible) = @_; 905 update_metaserver if $_[1];
729 $self->center if $visible;
730 }, 906 },
731 ; 907 ;
732 908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910
911 $dialog
912}
913
914sub server_setup {
915 my $vbox = new CFClient::UI::VBox;
916
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 917 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 918 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735 919
736 { 920 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 922
739 $vbox->add ( 923 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 924 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 925 expand => 1,
742 text => $CFG->{host}, 926 text => $CFG->{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 927 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 928 on_changed => sub {
745 my ($self, $value) = @_; 929 my ($self, $value) = @_;
… …
747 } 931 }
748 ); 932 );
749 933
750 $METASERVER = metaserver_dialog; 934 $METASERVER = metaserver_dialog;
751 935
752 $vbox->add (new CFClient::UI::Flopper 936 $vbox->add (new CFClient::UI::Button
753 expand => 1, 937 expand => 1,
754 text => "Server List", 938 text => "Server List",
755 other => $METASERVER, 939 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 940 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 941 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST;
759 }
760 ); 942 );
761 } 943 }
762 944
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 945 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 946 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 963 }
782 ); 964 );
783 965
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 966 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 967 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 968 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 969 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 970 tooltip => "This is the size of the portion of the map update the server sends you. "
789 . "If you set this to a high value you will be able to see further, " 971 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 972 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 973 . "This option is only used once at log-in.",
… …
831 $CONN ? stop_game 1013 $CONN ? stop_game
832 : start_game; 1014 : start_game;
833 }, 1015 },
834 ); 1016 );
835 1017
836 $dialog 1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1020 text => $CFG->{say_command},
1021 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. "
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub {
1025 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value;
1027 }
1028 );
1029
1030 $vbox
837} 1031}
838 1032
839sub message_window { 1033sub message_window {
840 my $window = new CFClient::UI::FancyFrame 1034 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 1035 name => "message_window",
842 title => "Messages", 1036 title => "Messages",
843 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
845 req_x => -1, 1039 x => "max",
846 req_y => 0, 1040 y => 0,
847 def_w => int $::WIDTH / 3, 1041 force_w => $::WIDTH * 0.4,
848 def_h => int $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
849 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
850 1044
851 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
852 1046
853 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
… …
867 }, 1061 },
868 on_activate => sub { 1062 on_activate => sub {
869 my ($input, $text) = @_; 1063 my ($input, $text) = @_;
870 $input->set_text (''); 1064 $input->set_text ('');
871 1065
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 1066 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 1067 $::CONN->user_send ($1);
876 } else { 1068 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 1069 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 1070 $::CONN->user_send ("$say_cmd $text");
879 } 1071 }
… …
887 }, 1079 },
888 ); 1080 );
889 1081
890 $CONSOLE = { 1082 $CONSOLE = {
891 window => $window, 1083 window => $window,
892 input => $input 1084 input => $input,
893 }; 1085 };
894 1086
895 $window 1087 $window
896} 1088}
897 1089
898sub open_quit_dialog { 1090sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 1091 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1093 x => "center",
1094 y => "center",
1095 z => 50,
1096 title => "Really Quit?",
1097 ;
901 1098
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 1100
904 $vb->add (new CFClient::UI::Label 1101 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 1102 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 1115 on_activate => sub { exit },
919 ); 1116 );
920 } 1117 }
921 1118
922 $QUIT_DIALOG->show; 1119 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center;
924} 1120}
925 1121
1122sub autopickup_setup {
1123 my $table = new CFClient::UI::Table;
1124
1125 for (
1126 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG],
1131 ],
1132 ["Weapons", 0, 6,
1133 ["All weapons" => PICKUP_ALLWEAPON],
1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1135 ["Bows" => PICKUP_BOW],
1136 ["Arrows" => PICKUP_ARROW],
1137 ],
1138 ["Armour", 0, 12,
1139 ["Helmets" => PICKUP_HELMET],
1140 ["Shields" => PICKUP_SHIELD],
1141 ["Body Armour" => PICKUP_ARMOUR],
1142 ["Boots" => PICKUP_BOOTS],
1143 ["Gloves" => PICKUP_GLOVES],
1144 ["Cloaks" => PICKUP_CLOAK],
1145 ],
1146
1147 ["Readables", 2, 2,
1148 ["Spellbooks" => PICKUP_SPELLBOOK],
1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ],
1152 ["Misc", 2, 7,
1153 ["Food" => PICKUP_FOOD],
1154 ["Drinks" => PICKUP_DRINK],
1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1156 ["Keys" => PICKUP_KEY],
1157 ["Magical Items" => PICKUP_MAGICAL],
1158 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS],
1162 ],
1163 )
1164 {
1165 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167
1168 for (@bits) {
1169 ++$y;
1170
1171 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask,
1175 on_changed => sub {
1176 my ($box, $value) = @_;
1177 if ($value) {
1178 $::CFG->{pickup} |= $mask;
1179 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1181 }
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1183 if defined $::CONN;
1184 });
1185 }
1186 }
1187
1188 $table
1189}
1190
926sub make_inventory_window { 1191sub inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1193 x => "center",
1194 y => "center",
928 def_w => $WIDTH * 7/8, 1195 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1196 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1197 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1198 ;
937 1199
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1201
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1202 $hb->add (my $vb1 = new CFClient::UI::VBox);
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1205
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1206 $hb->add (my $vb2 = new CFClient::UI::VBox);
945 1207
946 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
948 $hb2->add (new CFClient::UI::Button
949 text => "Close",
950 tooltip => "Close the currently open container (if one is open)",
951 on_activate => sub {
952 $CONN->send ("apply $CONN->{open_container}")
953 if $CONN->{open_container} != 0;
954 },
955 );
956 1209
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
958 1211
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
959 $invwin 1215 $invwin
960} 1216}
961 1217
962sub make_binding_window { 1218sub spell_setup {
1219 new CFClient::UI::SpellList
1220}
1221
1222sub keyboard_setup {
963 my $binding_list = new CFClient::UI::VBox; 1223 my $binding_list = new CFClient::UI::VBox;
964 1224
1225 my $refresh;
965 my $refresh = sub { 1226 $refresh = sub {
966 $binding_list->clear (); 1227 $binding_list->clear ();
967 1228
968 for my $mod (keys %{$::CFG->{bindings}}) { 1229 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 1233
973 my $lbl = join "; ", @$cmds; 1234 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 1236 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button 1237 $hb->add (new CFClient::UI::Button
977 text => "delete", 1238 text => "delete",
1239 tooltip => "Deletes the binding",
978 on_activate => sub { 1240 on_activate => sub {
979 $binding_list->remove ($hb); 1241 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 1242 delete $::CFG->{bindings}->{$mod}->{$sym};
981 }); 1243 });
1244
1245 $hb->add (new CFClient::UI::Button
1246 text => "edit",
1247 tooltip => "Edits the binding",
1248 on_activate => sub {
1249 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1251 sub {
1252 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym};
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show;
1258 },
1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show;
1262 });
1263 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide;
1265 });
1266
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 } 1269 }
985 } 1270 }
986 }; 1271 };
987 1272
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1273 my $vb = new CFClient::UI::VBox;
989 title => "Bindings", 1274 $vb->add ($binding_list);
990 def_w => int $WIDTH * 7/8, 1275 $vb->add (my $hb = new CFClient::UI::HBox);
991 def_h => int $HEIGHT * 7/8, 1276
992 on_visibility_change => sub { 1277 $hb->add (new CFClient::UI::Button
993 my ($self, $visible) = @_; 1278 text => "record new",
994 if ($visible) { 1279 expand => 1,
995 $self->center; 1280 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub {
1284 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
996 $refresh->() 1286 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1289 },
1290 sub {
1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1293 },
997 } 1294 );
1295 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show;
1297 },
1298 );
1299
1300 $hb->add (new CFClient::UI::Button
1301 text => "close",
1302 tooltip => "Closes the binding window",
1303 expand => 1,
1304 on_activate => sub {
1305 $SETUP_DIALOG->hide;
998 }; 1306 }
1307 );
999 1308
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->(); 1309 $refresh->();
1002 $BIND_WINDOW 1310
1311 $vb
1003} 1312}
1004 1313
1005sub make_help_window { 1314sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame 1315 my $win = new CFClient::UI::FancyFrame
1316 x => 'center',
1317 y => 'center',
1318 z => 2,
1319 name => 'doc_browser',
1007 def_w => int $WIDTH * 7/8, 1320 force_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8, 1321 force_h => int $HEIGHT * 7/8,
1009 title => "Documentation"; 1322 title => "Documentation";
1010 1323
1011 $win->add (my $vbox = new CFClient::UI::VBox); 1324 $win->add (my $vbox = new CFClient::UI::VBox);
1012 1325
1013 $vbox->add (my $buttons = new CFClient::UI::HBox); 1326 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1022 my ($pod, $label) = @$_; 1335 my ($pod, $label) = @$_;
1023 1336
1024 $buttons->add (new CFClient::UI::Button 1337 $buttons->add (new CFClient::UI::Button
1025 text => $label, 1338 text => $label,
1026 on_activate => sub { 1339 on_activate => sub {
1027 my $parser = new Pod::POM; 1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1028 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1029 1342
1030 $viewer->clear; 1343 $viewer->clear;
1031 1344
1032 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1033 for @{ CFClient::pod_to_pango_list $pom }; 1346 for @$pom;
1034 1347
1035 $viewer->set_offset (0); 1348 $viewer->set_offset (0);
1036 }, 1349 },
1037 ); 1350 );
1038 } 1351 }
… …
1075 if ($DEBUG_STATUS) { 1388 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1389 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1390 } else {
1078 # create the widgets 1391 # create the widgets
1079 1392
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1393 $DEBUG_STATUS = new CFClient::UI::Label
1394 padding => 0,
1395 z => 100,
1396 force_x => "max",
1397 force_y => 0;
1081 $DEBUG_STATUS->show; 1398 $DEBUG_STATUS->show;
1082 1399
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1401
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1402 $STATUSBOX = new CFClient::UI::Statusbox;
1084 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1085 1404
1086 (new CFClient::UI::Frame 1405 (new CFClient::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1406 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1407 force_x => 0,
1408 force_y => "max",
1089 child => $STATUSBOX, 1409 child => $STATUSBOX,
1090 )->show; 1410 )->show;
1091 1411
1092 CFClient::UI::FancyFrame->new ( 1412 CFClient::UI::FancyFrame->new (
1413 title => "Map",
1414 name => "mapmap",
1415 x => 0,
1416 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1417 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1418 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1419 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1096 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1420 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1097 ), 1421 ),
… …
1120 can_hover => 1, 1444 can_hover => 1,
1121 can_events => 1, 1445 can_events => 1,
1122 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1123 ; 1447 ;
1124 1448
1125 $BUTTONBAR = new CFClient::UI::HBox; 1449 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1450 title => "Setup",
1451 name => "setup_dialog",
1452 x => 'center',
1453 y => 'center',
1454 z => 2,
1455 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6,
1457 ;
1126 1458
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1463 "Configure the server to play on, your username, password and other server-related options.");
1464 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1465 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1479
1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1481
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1483 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1129 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1484
1130 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1131 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1132 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1133 1487
1134 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 1488 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
1135 1489
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1137 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1138 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1139 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1140 1495
1141 $BUTTONBAR->add (new CFClient::UI::Button 1496 $BUTTONBAR->add (new CFClient::UI::Button
1142 text => "Save Config", 1497 text => "Save Config",
1143 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1498 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1144 on_activate => sub { 1499 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1500 $::CFG->{layout} = CFClient::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1501 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1502 status "Configuration Saved";
1148 }, 1503 },
1149 ); 1504 );
1150 1505
1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1152 tooltip => "View Documentation"); 1507 tooltip => "View Documentation");
1153
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161 1508
1162 $BUTTONBAR->add (new CFClient::UI::Button 1509 $BUTTONBAR->add (new CFClient::UI::Button
1163 text => "Quit", 1510 text => "Quit",
1164 tooltip => "Terminates the program", 1511 tooltip => "Terminates the program",
1165 on_activate => sub { 1512 on_activate => sub {
… …
1170 } 1517 }
1171 }, 1518 },
1172 ); 1519 );
1173 1520
1174 $BUTTONBAR->show; 1521 $BUTTONBAR->show;
1175 1522 $SETUP_DIALOG->show;
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 } 1523 }
1524
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1180} 1526}
1181 1527
1182sub video_shutdown { 1528sub video_shutdown {
1183 undef $SDL_ACTIVE; 1529 undef $SDL_ACTIVE;
1184} 1530}
… …
1251 1597
1252my %demo;#d# 1598my %demo;#d#
1253 1599
1254sub force_refresh { 1600sub force_refresh {
1255 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1601 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1256 debug sprintf "%3.2f", $fps; 1602 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1603
1258 $CFClient::UI::ROOT->draw; 1604 $CFClient::UI::ROOT->draw;
1259 1605
1260 $WANT_REFRESH = 0; 1606 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1607 $CAN_REFRESH = 0;
… …
1316}; 1662};
1317 1663
1318 CFClient::SDL_GL_SwapBuffers; 1664 CFClient::SDL_GL_SwapBuffers;
1319} 1665}
1320 1666
1321my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1667my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1322 $NOW = time; 1668 $NOW = time;
1323 1669
1324 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1670 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1325 for CFClient::SDL_PollEvent; 1671 for CFClient::SDL_PollEvent;
1326 1672
… …
1393############################################################################# 1739#############################################################################
1394 1740
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1741$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1742
1397{ 1743{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1744 local $SIG{__DIE__} = sub {
1745 return unless defined $^S && !$^S;
1746 Carp::confess $_[1];#d#TODO: remove when stable
1747 CFClient::fatal $_[0];
1748 };
1399 1749
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1751 CFClient::UI::set_layout ($::CFG->{layout});
1402 1752
1403 my %DEF_CFG = ( 1753 my %DEF_CFG = (
1404 sdl_mode => 0, 1754 sdl_mode => 0,
1405 width => 640, 1755 width => 640,
… …
1409 map_scale => 1, 1759 map_scale => 1,
1410 fow_enable => 1, 1760 fow_enable => 1,
1411 fow_intensity => 0.45, 1761 fow_intensity => 0.45,
1412 fow_smooth => 0, 1762 fow_smooth => 0,
1413 gui_fontsize => 1, 1763 gui_fontsize => 1,
1414 log_fontsize => 1, 1764 log_fontsize => 0.7,
1415 gauge_fontsize=> 1, 1765 gauge_fontsize=> 1,
1416 gauge_size => 0.35, 1766 gauge_size => 0.35,
1417 stat_fontsize => 1, 1767 stat_fontsize => 0.7,
1418 mapsize => 100, 1768 mapsize => 100,
1419 host => "crossfire.schmorp.de", 1769 host => "crossfire.schmorp.de",
1420 say_command => 'say', 1770 say_command => 'say',
1421 audio_enable => 1, 1771 audio_enable => 1,
1422 bgm_enable => 1, 1772 bgm_enable => 1,
… …
1483 1833
1484END { CFClient::SDL_Quit } 1834END { CFClient::SDL_Quit }
1485 1835
1486=head1 NAME 1836=head1 NAME
1487 1837
1488pclient - A Crossfire+ and Crossfire game client 1838cfplus - A Crossfire+ and Crossfire game client
1489 1839
1490=head1 SYNOPSIS 1840=head1 SYNOPSIS
1491 1841
1492Just run it - no commandline arguments are supported. 1842Just run it - no commandline arguments are supported.
1493 1843
1494=head1 USAGE 1844=head1 USAGE
1495 1845
1496Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1846cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1497fullscreen and interactively. 1847fullscreen and interactively.
1498 1848
1849=head1 DEBUGGING
1850
1851
1852CFPLUS_DEBUG - environment variable
1853
1854 1 draw borders around widgets
1855 2 add low-level widget info to tooltips
1856 4 show fps
1857 8 suppress tooltips
1858
1499=head1 AUTHOR 1859=head1 AUTHOR
1500 1860
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1861Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 1862
1503 1863

Diff Legend

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