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.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.63 by root, Wed Jun 7 05:54:09 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;
88our $HOST_ENTRY;
86 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
87our $FLOORBOX; 98our $FLOORBOX;
88our $GAUGES; 99our $GAUGES;
89our $STATWIDS; 100our $STATWIDS;
90 101
91our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
97 108
98our $ALT_ENTER_MESSAGE; 109our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 110our $STATUSBOX;
100our $DEBUG_STATUS; 111our $DEBUG_STATUS;
101 112
113our $INV_WINDOW;
102our $INV; 114our $INV;
103our $INVR; 115our $INVR;
104our $INVR_LBL; 116our $INV_RIGHT_HB;
117
118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
105 121
106sub status { 122sub status {
107 $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]);
108} 124}
109 125
110sub debug { 126sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 128}
113 $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;
114} 309}
115 310
116sub start_game { 311sub start_game {
117 status "logging in..."; 312 status "logging in...";
313
314 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide;
118 316
119 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;
120 318
121 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
122 320
… …
134 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 333 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
137 map => $MAP, 335 map => $MAP,
138 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
139 338
140 sound_play => sub { 339 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
142 341
143 $SDL_MIXER 342 $SDL_MIXER
… …
151 }; 350 };
152 351
153 if ($CONN) { 352 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 353 CFClient::lowdelay fileno $CONN->{fh};
155 354
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 355 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 356 } else {
163 status "unable to connect"; 357 status "unable to connect";
164 stop_game(); 358 stop_game();
165 } 359 }
166} 360}
167 361
168sub stop_game { 362sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide;
367
169 return unless $CONN; 368 return unless $CONN;
170 369
171 status "connection closed"; 370 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 371
372 destroy_query_dialog $CONN;
173 $CONN->destroy; 373 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 375}
179 376
180sub client_setup { 377sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
379
187 $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]);
188 381
189 $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");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 384
192 $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]);
193 $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");
194 387
195 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 389 my ($self, $value) = @_;
197 390
… …
314 on_activate => sub { 507 on_activate => sub {
315 video_shutdown (); 508 video_shutdown ();
316 video_init (); 509 video_init ();
317 } 510 }
318 ); 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;
319 522
320 $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");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
323 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.",
… …
354 audio_shutdown (); 557 audio_shutdown ();
355 audio_init (); 558 audio_init ();
356 } 559 }
357 ); 560 );
358 561
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372} 563}
373 564
374sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
385 576
386sub make_gauge_window { 577sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 579
389 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
390 req_y => -1, 581 force_x => 0,
582 force_y => "max",
391 user_w => $WIDTH, 583 force_w => $WIDTH,
392 user_h => $gh, 584 force_h => $gh,
393 ); 585 );
394 586
395 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
396 children => [ 588 children => [
397 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
433 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
434 626
435 $win 627 $win
436} 628}
437 629
630
438sub make_stats_window { 631sub stats_window {
439 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
441 req_x => -1, 634 x => "max",
442 title => "Stats", 635 title => "Stats",
443 name => "stats_window"; 636 name => "stats_window";
444 637
445 $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);
446 $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,
447 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
448 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.");
… …
547 update_stats_window ({}); 740 update_stats_window ({});
548 741
549 $tgw 742 $tgw
550} 743}
551 744
552sub formsep { 745sub formsep($) {
553 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
554} 747}
555 748
556sub update_stats_window { 749sub update_stats_window {
557 my ($stats) = @_; 750 my ($stats) = @_;
558 751
… …
620 813
621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622 for keys %tbl; 815 for keys %tbl;
623} 816}
624 817
625sub metaserver_dialog {
626 my $dialog = new CFClient::UI::FancyFrame
627 title => "Server List",
628 child => (my $vbox = new CFClient::UI::VBox);
629
630 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632 $dialog
633}
634
635my $METASERVER_ATIME; 818my $METASERVER_ATIME;
636 819
637sub update_metaserver { 820sub update_metaserver {
638 my ($HOST) = @_;
639
640 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
641 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
642 823
643 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
644 $table->clear; 825 $table->clear;
… …
665 846
666 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
667 848
668 $table->clear; 849 $table->clear;
669 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
670 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
671 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
672 for 0 .. $#col; 863 for 0 .. $#col;
673 864
674 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
675 866
676 my $y = 0; 867 my $y = 0;
677 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
694 885
695 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
696 887
697 $y++; 888 $y++;
698 889
699 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
700 (new CFClient::UI::Button text => "Use", on_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
701 $HOST->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
896 $METASERVER->hide;
897 },
702 }), 898 ),
703 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
704 ]); 900 ]);
705 901
706 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
707 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
708 for 0 .. $#$m; 910 for 0 .. $#$m;
709 } 911 }
710 } 912 }
711 }); 913 });
712} 914}
713 915
916sub metaserver_dialog {
917 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List",
919 name => 'metaserver_dialog',
920 x => 'center',
921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox),
925 on_visibility_change => sub {
926 update_metaserver if $_[1];
927 },
928 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933
934 $dialog
935}
936
714sub server_setup { 937sub server_setup {
715 my $dialog = new CFClient::UI::FancyFrame 938 my $vbox = new CFClient::UI::VBox;
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
719 title => "Server Setup",
720 child => (my $vbox = new CFClient::UI::VBox),
721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724 939
725 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
726 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727 942
728 { 943 {
729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730 945
731 $vbox->add ( 946 $vbox->add (
732 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFClient::UI::Entry
733 expand => 1, 948 expand => 1,
734 text => $CFG->{host}, 949 text => $CFG->{host},
735 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736 on_changed => sub { 951 on_changed => sub {
737 my ($self, $value) = @_; 952 my ($self, $value) = @_;
… …
739 } 954 }
740 ); 955 );
741 956
742 $METASERVER = metaserver_dialog; 957 $METASERVER = metaserver_dialog;
743 958
744 $vbox->add (new CFClient::UI::Flopper 959 $vbox->add (new CFClient::UI::Button
745 expand => 1, 960 expand => 1,
746 text => "Server List", 961 text => "Server List",
747 other => $METASERVER, 962 other => $METASERVER,
748 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
749 on_open => sub { 964 on_activate => sub { $METASERVER->toggle_visibility },
750 update_metaserver $HOST; 965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
751 }
752 ); 966 );
753 } 967 }
754 968
755 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
773 } 987 }
774 ); 988 );
775 989
776 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 990 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777 $table->add (1, 7, new CFClient::UI::Slider 991 $table->add (1, 7, new CFClient::UI::Slider
778 req_w => 100, 992 force_w => 100,
779 range => [$CFG->{mapsize}, 10, 100, 0, 1], 993 range => [$CFG->{mapsize}, 10, 100, 0, 1],
780 tooltip => "This is the size of the portion of the map update the server sends you. " 994 tooltip => "This is the size of the portion of the map update the server sends you. "
781 . "If you set this to a high value you will be able to see further, " 995 . "If you set this to a high value you will be able to see further, "
782 . "but you also increase bandwidth requirements and latency. " 996 . "but you also increase bandwidth requirements and latency. "
783 . "This option is only used once at log-in.", 997 . "This option is only used once at log-in.",
… …
823 $CONN ? stop_game 1037 $CONN ? stop_game
824 : start_game; 1038 : start_game;
825 }, 1039 },
826 ); 1040 );
827 1041
828 $dialog 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1044 text => $CFG->{say_command},
1045 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub {
1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value;
1051 }
1052 );
1053
1054 $vbox
829} 1055}
830 1056
831sub message_window { 1057sub message_window {
832 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
833 name => "message_window", 1059 name => "message_window",
834 title => "Messages", 1060 title => "Messages",
835 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
836 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
837 req_x => -1, 1063 x => "max",
838 user_w => int $::WIDTH / 3, 1064 y => 0,
1065 force_w => $::WIDTH * 0.4,
839 user_h => int $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
840 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
841 1068
842 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
843 1070
844 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
876 }, 1103 },
877 ); 1104 );
878 1105
879 $CONSOLE = { 1106 $CONSOLE = {
880 window => $window, 1107 window => $window,
881 input => $input 1108 input => $input,
882 }; 1109 };
883 1110
884 $window 1111 $window
885} 1112}
886 1113
887sub open_quit_dialog { 1114sub open_quit_dialog {
888 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
889
890 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1117 x => "center",
1118 y => "center",
1119 z => 50,
1120 title => "Really Quit?",
1121 ;
891 1122
892 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893 1124
894 $vb->add (new CFClient::UI::Label 1125 $vb->add (new CFClient::UI::Label
895 text => "You should find a savebed and apply it first!", 1126 text => "You should find a savebed and apply it first!",
… …
905 $hb->add (new CFClient::UI::Button 1136 $hb->add (new CFClient::UI::Button
906 text => "Quit anyway", 1137 text => "Quit anyway",
907 expand => 1, 1138 expand => 1,
908 on_activate => sub { exit }, 1139 on_activate => sub { exit },
909 ); 1140 );
910
911 $QUIT_DIALOG->show_centered;
912 } else {
913 $QUIT_DIALOG->show_centered;
914 } 1141 }
915}
916 1142
1143 $QUIT_DIALOG->show;
1144}
1145
1146sub autopickup_setup {
1147 my $table = new CFClient::UI::Table;
1148
1149 for (
1150 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG],
1155 ],
1156 ["Weapons", 0, 6,
1157 ["All weapons" => PICKUP_ALLWEAPON],
1158 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1159 ["Bows" => PICKUP_BOW],
1160 ["Arrows" => PICKUP_ARROW],
1161 ],
1162 ["Armour", 0, 12,
1163 ["Helmets" => PICKUP_HELMET],
1164 ["Shields" => PICKUP_SHIELD],
1165 ["Body Armour" => PICKUP_ARMOUR],
1166 ["Boots" => PICKUP_BOOTS],
1167 ["Gloves" => PICKUP_GLOVES],
1168 ["Cloaks" => PICKUP_CLOAK],
1169 ],
1170
1171 ["Readables", 2, 2,
1172 ["Spellbooks" => PICKUP_SPELLBOOK],
1173 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1174 ["Normal Books/Scrolls" => PICKUP_READABLES],
1175 ],
1176 ["Misc", 2, 7,
1177 ["Food" => PICKUP_FOOD],
1178 ["Drinks" => PICKUP_DRINK],
1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1180 ["Keys" => PICKUP_KEY],
1181 ["Magical Items" => PICKUP_MAGICAL],
1182 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS],
1186 ],
1187 )
1188 {
1189 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191
1192 for (@bits) {
1193 ++$y;
1194
1195 my $mask = $_->[1];
1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask,
1199 on_changed => sub {
1200 my ($box, $value) = @_;
1201
1202 if ($value) {
1203 $::CFG->{pickup} |= $mask;
1204 } else {
1205 $::CFG->{pickup} &= ~$mask;
1206 }
1207
1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN;
1210 });
1211 }
1212 }
1213
1214 $table
1215}
1216
917sub make_inventory_window { 1217sub inventory_window {
918 my $invwin = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1219 x => "center",
1220 y => "center",
919 user_w => $WIDTH * (7/8), 1221 force_w => $WIDTH * 9/10,
920 user_h => $HEIGHT * (7/8), 1222 force_h => $HEIGHT * 9/10,
921 title => "Inventory", 1223 title => "Inventory",
922 name => "inventory_window", 1224 ;
923 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1]
925 };
926 1225
927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
928 1227
929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1228 $hb->add (my $vb1 = new CFClient::UI::VBox);
930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
931 $lbl->set_text ("Player");
932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933 1231
934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1232 $hb->add (my $vb2 = new CFClient::UI::VBox);
935 1233
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1235
1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1237
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
1241 $invwin
1242}
1243
1244sub spell_setup {
1245 new CFClient::UI::SpellList
1246}
1247
1248sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox;
1250
1251 my $refresh;
1252 $refresh = sub {
1253 $binding_list->clear ();
1254
1255 for my $mod (keys %{$::CFG->{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259
1260 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button
1264 text => "delete",
1265 tooltip => "Deletes the binding",
1266 on_activate => sub {
1267 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym};
1269 });
1270
1271 $hb->add (new CFClient::UI::Button
1272 text => "edit",
1273 tooltip => "Edits the binding",
1274 on_activate => sub {
1275 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1277 sub {
1278 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym};
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1281 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show;
1284 },
1285 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show;
1288 });
1289 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide;
1291 });
1292
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 }
1296 }
1297 };
1298
1299 my $vb = new CFClient::UI::VBox;
1300 $vb->add ($binding_list);
936 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1301 $vb->add (my $hb = new CFClient::UI::HBox);
937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1302
938 $hb2->add (new CFClient::UI::Button 1303 $hb->add (new CFClient::UI::Button
939 text => "Close", 1304 text => "record new",
940 tooltip => "Close the currently open container (if one is open)", 1305 expand => 1,
1306 tooltip => "This button opens the binding editor with an empty binding.",
941 on_activate => sub { 1307 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}") 1308 $::BIND_EDITOR->set_binding (undef, undef, [],
943 if $CONN->{open_container} != 0; 1309 sub {
1310 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1312 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show;
1315 },
1316 sub {
1317 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1318 $SETUP_DIALOG->show;
1319 },
1320 );
1321 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show;
944 }, 1323 },
945 ); 1324 );
946 1325
947 $INVR_LBL->set_text ("Floor"); 1326 $hb->add (new CFClient::UI::Button
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1327 text => "close",
1328 tooltip => "Closes the binding window",
1329 expand => 1,
1330 on_activate => sub {
1331 $SETUP_DIALOG->hide;
1332 }
1333 );
949 1334
950 $invwin 1335 $refresh->();
1336
1337 $vb
951} 1338}
952 1339
953sub make_help_window { 1340sub make_help_window {
954 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
955 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1342 x => 'center',
1343 y => 'center',
1344 z => 2,
1345 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation";
956 1349
957 $win->add (my $vbox = new CFClient::UI::VBox); 1350 $win->add (my $vbox = new CFClient::UI::VBox);
958 1351
959 $vbox->add (my $buttons = new CFClient::UI::HBox); 1352 $vbox->add (my $buttons = new CFClient::UI::HBox);
960 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1353 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
968 my ($pod, $label) = @$_; 1361 my ($pod, $label) = @$_;
969 1362
970 $buttons->add (new CFClient::UI::Button 1363 $buttons->add (new CFClient::UI::Button
971 text => $label, 1364 text => $label,
972 on_activate => sub { 1365 on_activate => sub {
973 my $parser = new Pod::POM; 1366 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1367 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
975 1368
976 $viewer->clear; 1369 $viewer->clear;
977 1370
978 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1371 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
979 for @{ CFClient::pod_to_pango_list $pom }; 1372 for @$pom;
980 1373
981 $viewer->set_offset (0); 1374 $viewer->set_offset (0);
982 }, 1375 },
983 ); 1376 );
984 } 1377 }
… …
1021 if ($DEBUG_STATUS) { 1414 if ($DEBUG_STATUS) {
1022 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1415 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023 } else { 1416 } else {
1024 # create the widgets 1417 # create the widgets
1025 1418
1026 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1419 $DEBUG_STATUS = new CFClient::UI::Label
1420 padding => 0,
1421 z => 100,
1422 force_x => "max",
1423 force_y => 0;
1027 $DEBUG_STATUS->show; 1424 $DEBUG_STATUS->show;
1028 1425
1426 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1427
1029 $STATUSBOX = new CFClient::UI::Statusbox; 1428 $STATUSBOX = new CFClient::UI::Statusbox;
1030 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1429 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1031 1430
1032 (new CFClient::UI::Frame 1431 (new CFClient::UI::Frame
1033 bg => [0, 0, 0, 0.4], 1432 bg => [0, 0, 0, 0.4],
1034 req_y => -1, 1433 force_x => 0,
1434 force_y => "max",
1035 child => $STATUSBOX, 1435 child => $STATUSBOX,
1036 )->show; 1436 )->show;
1037 1437
1038 CFClient::UI::FancyFrame->new ( 1438 CFClient::UI::FancyFrame->new (
1439 title => "Map",
1440 name => "mapmap",
1441 x => 0,
1442 y => $FONTSIZE + 8,
1039 border_bg => [1, 1, 1, 192/255], 1443 border_bg => [1, 1, 1, 192/255],
1040 bg => [1, 1, 1, 0], 1444 bg => [1, 1, 1, 0],
1041 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1445 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1042 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1446 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043 ), 1447 ),
… …
1061 1465
1062 $LOGVIEW = new CFClient::UI::TextView 1466 $LOGVIEW = new CFClient::UI::TextView
1063 expand => 1, 1467 expand => 1,
1064 font => $FONT_FIXED, 1468 font => $FONT_FIXED,
1065 fontsize => $::CFG->{log_fontsize}, 1469 fontsize => $::CFG->{log_fontsize},
1470 indent => -4,
1066 can_hover => 1, 1471 can_hover => 1,
1067 can_events => 1, 1472 can_events => 1,
1068 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1473 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069 ; 1474 ;
1070 1475
1071 $BUTTONBAR = new CFClient::UI::HBox; 1476 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1477 title => "Setup",
1478 name => "setup_dialog",
1479 x => 'center',
1480 y => 'center',
1481 z => 2,
1482 force_w => $::WIDTH * 0.6,
1483 force_h => $::HEIGHT * 0.6,
1484 ;
1072 1485
1486 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1487 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1488
1489 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1490 "Configure the server to play on, your username, password and other server-related options.");
1491 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1492 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1493 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1494 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1495 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1496 "Configure the use of audio, sound effects and background music.");
1497 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1498 "Lets you define, edit and delete bindings."
1499 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1500 . "with nothing set and the recording started. After doing the actions you "
1501 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1502 . "After pressing the combo the binding will be saved automatically and the "
1503 . "binding editor closes");
1504 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1505 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1506
1507 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1508
1073 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1509 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1074 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1510 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1075 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1511
1076 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1512 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1078 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1079 1514
1080 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 1515 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
1081 1516
1082 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1083 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1518 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1084 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1085 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1520 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1521 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1086 1522
1087 $BUTTONBAR->add (new CFClient::UI::Button 1523 $BUTTONBAR->add (new CFClient::UI::Button
1088 text => "Save Config", 1524 text => "Save Config",
1089 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1525 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1090 on_activate => sub { 1526 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout; 1527 $::CFG->{layout} = CFClient::UI::get_layout;
1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1528 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093 status "Configuration Saved"; 1529 status "Configuration Saved";
1094 }, 1530 },
1095 ); 1531 );
1096 1532
1097 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1533 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1108 } 1544 }
1109 }, 1545 },
1110 ); 1546 );
1111 1547
1112 $BUTTONBAR->show; 1548 $BUTTONBAR->show;
1113 1549 $SETUP_DIALOG->show;
1114 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1115
1116 # delay till geometry is constant
1117 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119 my $widget = $GAUGES->{win};
1120 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121 });
1122 force_refresh ();
1123 } 1550 }
1551
1552 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124} 1553}
1125 1554
1126sub video_shutdown { 1555sub video_shutdown {
1127 undef $SDL_ACTIVE; 1556 undef $SDL_ACTIVE;
1128} 1557}
… …
1195 1624
1196my %demo;#d# 1625my %demo;#d#
1197 1626
1198sub force_refresh { 1627sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1628 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1629 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1630
1202 $CFClient::UI::ROOT->draw; 1631 $CFClient::UI::ROOT->draw;
1203 1632
1204 $WANT_REFRESH = 0; 1633 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1634 $CAN_REFRESH = 0;
… …
1260}; 1689};
1261 1690
1262 CFClient::SDL_GL_SwapBuffers; 1691 CFClient::SDL_GL_SwapBuffers;
1263} 1692}
1264 1693
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1694my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 1695 $NOW = time;
1267 1696
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1697 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1698 for CFClient::SDL_PollEvent;
1270 1699
… …
1337############################################################################# 1766#############################################################################
1338 1767
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1768$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1769
1341{ 1770{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1771 local $SIG{__DIE__} = sub {
1772 return unless defined $^S && !$^S;
1773 Carp::confess $_[1];#d#TODO: remove when stable
1774 CFClient::fatal $_[0];
1775 };
1343 1776
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1777 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1778 CFClient::UI::set_layout ($::CFG->{layout});
1346 1779
1347 my %DEF_CFG = ( 1780 my %DEF_CFG = (
1348 sdl_mode => 0, 1781 sdl_mode => 0,
1349 width => 640, 1782 width => 640,
… …
1353 map_scale => 1, 1786 map_scale => 1,
1354 fow_enable => 1, 1787 fow_enable => 1,
1355 fow_intensity => 0.45, 1788 fow_intensity => 0.45,
1356 fow_smooth => 0, 1789 fow_smooth => 0,
1357 gui_fontsize => 1, 1790 gui_fontsize => 1,
1358 log_fontsize => 1, 1791 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 1792 gauge_fontsize=> 1,
1360 gauge_size => 0.35, 1793 gauge_size => 0.35,
1361 stat_fontsize => 1, 1794 stat_fontsize => 0.7,
1362 mapsize => 100, 1795 mapsize => 100,
1363 host => "crossfire.schmorp.de", 1796 host => "crossfire.schmorp.de",
1364 say_command => 'say', 1797 say_command => 'say',
1365 audio_enable => 1, 1798 audio_enable => 1,
1366 bgm_enable => 1, 1799 bgm_enable => 1,
1367 bgm_volume => 0.25, 1800 bgm_volume => 0.25,
1368 face_prefetch => 0, 1801 face_prefetch => 0,
1369 output_sync => 1, 1802 output_sync => 1,
1370 output_count => 1, 1803 output_count => 1,
1804 pickup => 0,
1371 ); 1805 );
1372 1806
1373 while (my ($k, $v) = each %DEF_CFG) { 1807 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 1808 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 1809 }
… …
1427 1861
1428END { CFClient::SDL_Quit } 1862END { CFClient::SDL_Quit }
1429 1863
1430=head1 NAME 1864=head1 NAME
1431 1865
1432pclient - A Crossfire+ and Crossfire game client 1866cfplus - A Crossfire+ and Crossfire game client
1433 1867
1434=head1 SYNOPSIS 1868=head1 SYNOPSIS
1435 1869
1436Just run it - no commandline arguments are supported. 1870Just run it - no commandline arguments are supported.
1437 1871
1438=head1 USAGE 1872=head1 USAGE
1439 1873
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1874cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1875fullscreen and interactively.
1442 1876
1877=head1 DEBUGGING
1878
1879
1880CFPLUS_DEBUG - environment variable
1881
1882 1 draw borders around widgets
1883 2 add low-level widget info to tooltips
1884 4 show fps
1885 8 suppress tooltips
1886
1443=head1 AUTHOR 1887=head1 AUTHOR
1444 1888
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1889Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1890
1447 1891

Diff Legend

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