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.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 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 name => "client_setup",
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
379
185 $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]);
186 381
187 $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");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 384
190 $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]);
191 $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");
192 387
193 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 389 my ($self, $value) = @_;
195 390
… …
312 on_activate => sub { 507 on_activate => sub {
313 video_shutdown (); 508 video_shutdown ();
314 video_init (); 509 video_init ();
315 } 510 }
316 ); 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;
317 522
318 $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");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
321 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.",
… …
352 audio_shutdown (); 557 audio_shutdown ();
353 audio_init (); 558 audio_init ();
354 } 559 }
355 ); 560 );
356 561
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 on_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370} 563}
371 564
372sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 576
384sub make_gauge_window { 577sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 579
387 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
388 req_y => -1, 581 force_x => 0,
582 force_y => "max",
389 user_w => $WIDTH, 583 force_w => $WIDTH,
390 user_h => $gh, 584 force_h => $gh,
391 ); 585 );
392 586
393 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 588 children => [
395 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
432 626
433 $win 627 $win
434} 628}
435 629
630
436sub make_stats_window { 631sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 632 my $tgw = new CFClient::UI::FancyFrame
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
438 637
439 $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);
440 $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,
441 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
442 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.");
… …
541 update_stats_window ({}); 740 update_stats_window ({});
542 741
543 $tgw 742 $tgw
544} 743}
545 744
546sub formsep { 745sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 747}
549 748
550sub update_stats_window { 749sub update_stats_window {
551 my ($stats) = @_; 750 my ($stats) = @_;
552 751
… …
614 813
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 815 for keys %tbl;
617} 816}
618 817
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627}
628
629my $METASERVER_ATIME; 818my $METASERVER_ATIME;
630 819
631sub update_metaserver { 820sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
636 823
637 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
638 $table->clear; 825 $table->clear;
… …
659 846
660 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
661 848
662 $table->clear; 849 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 863 for 0 .. $#col;
667 864
668 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
669 866
670 my $y = 0; 867 my $y = 0;
671 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) {
… …
688 885
689 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
690 887
691 $y++; 888 $y++;
692 889
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
896 $METASERVER->hide;
897 },
696 }), 898 ),
697 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
698 ]); 900 ]);
699 901
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
701 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)
702 for 0 .. $#$m; 910 for 0 .. $#$m;
703 } 911 }
704 } 912 }
705 }); 913 });
706} 914}
707 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
708sub server_setup { 937sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 name => "server_setup",
711 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 938 my $vbox = new CFClient::UI::VBox;
713 939
714 $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]);
715 $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");
716 942
717 { 943 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 945
720 $vbox->add ( 946 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 948 expand => 1,
723 text => $CFG->{host}, 949 text => $CFG->{host},
724 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",
725 on_changed => sub { 951 on_changed => sub {
726 my ($self, $value) = @_; 952 my ($self, $value) = @_;
… …
728 } 954 }
729 ); 955 );
730 956
731 $METASERVER = metaserver_dialog; 957 $METASERVER = metaserver_dialog;
732 958
733 $vbox->add (new CFClient::UI::Flopper 959 $vbox->add (new CFClient::UI::Button
734 expand => 1, 960 expand => 1,
735 text => "Server List", 961 text => "Server List",
736 other => $METASERVER, 962 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
738 on_open => sub { 964 on_activate => sub { $METASERVER->toggle_visibility },
739 update_metaserver $HOST; 965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
740 }
741 ); 966 );
742 } 967 }
743 968
744 $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");
745 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
… …
762 } 987 }
763 ); 988 );
764 989
765 $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");
766 $table->add (1, 7, new CFClient::UI::Slider 991 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 992 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 993 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 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. "
770 . "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, "
771 . "but you also increase bandwidth requirements and latency. " 996 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 997 . "This option is only used once at log-in.",
… …
812 $CONN ? stop_game 1037 $CONN ? stop_game
813 : start_game; 1038 : start_game;
814 }, 1039 },
815 ); 1040 );
816 1041
817 $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
818} 1055}
819 1056
820sub message_window { 1057sub message_window {
821 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 1059 name => "message_window",
823 title => "Messages", 1060 title => "Messages",
824 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
826 user_w => int $::WIDTH / 3, 1063 x => "max",
1064 y => 0,
1065 force_w => $::WIDTH * 0.4,
827 user_h => int $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
828 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
829 1068
830 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
831 1070
832 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
… …
864 }, 1103 },
865 ); 1104 );
866 1105
867 $CONSOLE = { 1106 $CONSOLE = {
868 window => $window, 1107 window => $window,
869 input => $input 1108 input => $input,
870 }; 1109 };
871 1110
872 $window 1111 $window
873} 1112}
874 1113
875sub open_quit_dialog { 1114sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
877
878 $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 ;
879 1122
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 1124
882 $vb->add (new CFClient::UI::Label 1125 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 1126 text => "You should find a savebed and apply it first!",
… …
893 $hb->add (new CFClient::UI::Button 1136 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 1137 text => "Quit anyway",
895 expand => 1, 1138 expand => 1,
896 on_activate => sub { exit }, 1139 on_activate => sub { exit },
897 ); 1140 );
898
899 $QUIT_DIALOG->show_centered;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 } 1141 }
903}
904 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 if ($value) {
1202 $::CFG->{pickup} |= $mask;
1203 } else {
1204 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1205 }
1206 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1207 if defined $::CONN;
1208 });
1209 }
1210 }
1211
1212 $table
1213}
1214
905sub make_inventory_window { 1215sub inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 1216 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 1217 x => "center",
1218 y => "center",
1219 force_w => $WIDTH * 9/10,
1220 force_h => $HEIGHT * 9/10,
1221 title => "Inventory",
1222 ;
908 1223
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1224 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 1225
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1226 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1227 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1228 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 1229
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1230 $hb->add (my $vb2 = new CFClient::UI::VBox);
917 1231
1232 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1233
1234 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1235
1236 # XXX: Call after $INVR = ... because set_opencont sets the items
1237 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1238
1239 $invwin
1240}
1241
1242sub spell_setup {
1243 new CFClient::UI::SpellList
1244}
1245
1246sub keyboard_setup {
1247 my $binding_list = new CFClient::UI::VBox;
1248
1249 my $refresh;
1250 $refresh = sub {
1251 $binding_list->clear ();
1252
1253 for my $mod (keys %{$::CFG->{bindings}}) {
1254 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1255 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1256 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1257
1258 my $lbl = join "; ", @$cmds;
1259 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1260 $binding_list->add (my $hb = new CFClient::UI::HBox);
1261 $hb->add (new CFClient::UI::Button
1262 text => "delete",
1263 tooltip => "Deletes the binding",
1264 on_activate => sub {
1265 $binding_list->remove ($hb);
1266 delete $::CFG->{bindings}->{$mod}->{$sym};
1267 });
1268
1269 $hb->add (new CFClient::UI::Button
1270 text => "edit",
1271 tooltip => "Edits the binding",
1272 on_activate => sub {
1273 $::BIND_EDITOR->set_binding (
1274 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1275 sub {
1276 my ($nmod, $nsym, $ncmds) = @_;
1277 delete $::CFG->{bindings}->{$mod}->{$sym};
1278 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1279 $refresh->();
1280 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1281 $SETUP_DIALOG->show;
1282 },
1283 sub {
1284 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1285 $SETUP_DIALOG->show;
1286 });
1287 $::BIND_EDITOR->show;
1288 $SETUP_DIALOG->hide;
1289 });
1290
1291 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1292 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1293 }
1294 }
1295 };
1296
1297 my $vb = new CFClient::UI::VBox;
1298 $vb->add ($binding_list);
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1299 $vb->add (my $hb = new CFClient::UI::HBox);
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1300
920 $hb2->add (new CFClient::UI::Button 1301 $hb->add (new CFClient::UI::Button
921 text => "Close", 1302 text => "record new",
922 tooltip => "Close the currently open container (if one is open)", 1303 expand => 1,
1304 tooltip => "This button opens the binding editor with an empty binding.",
923 on_activate => sub { 1305 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}") 1306 $::BIND_EDITOR->set_binding (undef, undef, [],
925 if $CONN->{open_container} != 0; 1307 sub {
1308 my ($mod, $sym, $cmds) = @_;
1309 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1310 $refresh->();
1311 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1312 $SETUP_DIALOG->show;
1313 },
1314 sub {
1315 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1316 $SETUP_DIALOG->show;
1317 },
1318 );
1319 $SETUP_DIALOG->hide;
1320 $::BIND_EDITOR->show;
926 }, 1321 },
927 ); 1322 );
928 1323
929 $INVR_LBL->set_text ("Floor"); 1324 $hb->add (new CFClient::UI::Button
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1325 text => "close",
1326 tooltip => "Closes the binding window",
1327 expand => 1,
1328 on_activate => sub {
1329 $SETUP_DIALOG->hide;
1330 }
1331 );
931 1332
932 $invwin 1333 $refresh->();
1334
1335 $vb
933} 1336}
934 1337
935sub make_help_window { 1338sub make_help_window {
936 my $win = new CFClient::UI::FancyFrame 1339 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1340 x => 'center',
1341 y => 'center',
1342 z => 2,
1343 name => 'doc_browser',
1344 force_w => int $WIDTH * 7/8,
1345 force_h => int $HEIGHT * 7/8,
1346 title => "Documentation";
938 1347
939 $win->add (my $vbox = new CFClient::UI::VBox); 1348 $win->add (my $vbox = new CFClient::UI::VBox);
940 1349
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1350 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1351 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
950 my ($pod, $label) = @$_; 1359 my ($pod, $label) = @$_;
951 1360
952 $buttons->add (new CFClient::UI::Button 1361 $buttons->add (new CFClient::UI::Button
953 text => $label, 1362 text => $label,
954 on_activate => sub { 1363 on_activate => sub {
955 my $parser = new Pod::POM; 1364 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
956 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1365 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
957 1366
958 $viewer->clear; 1367 $viewer->clear;
959 1368
960 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1369 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
961 for @{ CFClient::pod_to_pango_list $pom }; 1370 for @$pom;
962 1371
963 $viewer->set_offset (0); 1372 $viewer->set_offset (0);
964 }, 1373 },
965 ); 1374 );
966 } 1375 }
… …
1003 if ($DEBUG_STATUS) { 1412 if ($DEBUG_STATUS) {
1004 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1413 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005 } else { 1414 } else {
1006 # create the widgets 1415 # create the widgets
1007 1416
1008 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1417 $DEBUG_STATUS = new CFClient::UI::Label
1418 padding => 0,
1419 z => 100,
1420 force_x => "max",
1421 force_y => 0;
1009 $DEBUG_STATUS->show; 1422 $DEBUG_STATUS->show;
1010 1423
1424 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1425
1011 $STATUSBOX = new CFClient::UI::Statusbox; 1426 $STATUSBOX = new CFClient::UI::Statusbox;
1012 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1427 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1013 1428
1014 (new CFClient::UI::Frame 1429 (new CFClient::UI::Frame
1015 bg => [0, 0, 0, 0.4], 1430 bg => [0, 0, 0, 0.4],
1016 req_y => -1, 1431 force_x => 0,
1432 force_y => "max",
1017 child => $STATUSBOX, 1433 child => $STATUSBOX,
1018 )->show; 1434 )->show;
1019 1435
1020 CFClient::UI::FancyFrame->new ( 1436 CFClient::UI::FancyFrame->new (
1437 title => "Map",
1438 name => "mapmap",
1439 x => 0,
1440 y => $FONTSIZE + 8,
1021 border_bg => [1, 1, 1, 192/255], 1441 border_bg => [1, 1, 1, 192/255],
1022 bg => [1, 1, 1, 0], 1442 bg => [1, 1, 1, 0],
1023 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1443 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1444 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025 ), 1445 ),
… …
1043 1463
1044 $LOGVIEW = new CFClient::UI::TextView 1464 $LOGVIEW = new CFClient::UI::TextView
1045 expand => 1, 1465 expand => 1,
1046 font => $FONT_FIXED, 1466 font => $FONT_FIXED,
1047 fontsize => $::CFG->{log_fontsize}, 1467 fontsize => $::CFG->{log_fontsize},
1468 indent => -4,
1048 can_hover => 1, 1469 can_hover => 1,
1049 can_events => 1, 1470 can_events => 1,
1050 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1471 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051 ; 1472 ;
1052 1473
1053 $BUTTONBAR = new CFClient::UI::HBox; 1474 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1475 title => "Setup",
1476 name => "setup_dialog",
1477 x => 'center',
1478 y => 'center',
1479 z => 2,
1480 force_w => $::WIDTH * 0.6,
1481 force_h => $::HEIGHT * 0.6,
1482 ;
1054 1483
1484 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1485 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1486
1487 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1488 "Configure the server to play on, your username, password and other server-related options.");
1489 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1490 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1491 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1492 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1493 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1494 "Configure the use of audio, sound effects and background music.");
1495 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1496 "Lets you define, edit and delete bindings."
1497 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1498 . "with nothing set and the recording started. After doing the actions you "
1499 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1500 . "After pressing the combo the binding will be saved automatically and the "
1501 . "binding editor closes");
1502 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1503 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1504
1505 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1506
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1056 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1508 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1057 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1509
1058 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1059 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1510 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1060 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1511 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1061 1512
1062 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 1513 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
1063 1514
1064 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1515 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1065 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1516 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1067 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1518 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1519 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1068 1520
1069 $BUTTONBAR->add (new CFClient::UI::Button 1521 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1522 text => "Save Config",
1071 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1523 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072 on_activate => sub { 1524 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1525 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1526 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075 status "Configuration Saved"; 1527 status "Configuration Saved";
1076 }, 1528 },
1077 ); 1529 );
1078 1530
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1531 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1090 } 1542 }
1091 }, 1543 },
1092 ); 1544 );
1093 1545
1094 $BUTTONBAR->show; 1546 $BUTTONBAR->show;
1095 1547 $SETUP_DIALOG->show;
1096 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098 # delay till geometry is constant
1099 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101 my $widget = $GAUGES->{win};
1102 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103 });
1104 force_refresh ();
1105 } 1548 }
1549
1550 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1106} 1551}
1107 1552
1108sub video_shutdown { 1553sub video_shutdown {
1109 undef $SDL_ACTIVE; 1554 undef $SDL_ACTIVE;
1110} 1555}
… …
1177 1622
1178my %demo;#d# 1623my %demo;#d#
1179 1624
1180sub force_refresh { 1625sub force_refresh {
1181 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1626 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1182 debug sprintf "%3.2f", $fps; 1627 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183 1628
1184 $CFClient::UI::ROOT->draw; 1629 $CFClient::UI::ROOT->draw;
1185 1630
1186 $WANT_REFRESH = 0; 1631 $WANT_REFRESH = 0;
1187 $CAN_REFRESH = 0; 1632 $CAN_REFRESH = 0;
… …
1242}; 1687};
1243 1688
1244 CFClient::SDL_GL_SwapBuffers; 1689 CFClient::SDL_GL_SwapBuffers;
1245} 1690}
1246 1691
1247my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1692my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1248 $NOW = time; 1693 $NOW = time;
1249 1694
1250 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1695 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1251 for CFClient::SDL_PollEvent; 1696 for CFClient::SDL_PollEvent;
1252 1697
… …
1319############################################################################# 1764#############################################################################
1320 1765
1321$SIG{INT} = $SIG{TERM} = sub { exit }; 1766$SIG{INT} = $SIG{TERM} = sub { exit };
1322 1767
1323{ 1768{
1324 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1769 local $SIG{__DIE__} = sub {
1770 return unless defined $^S && !$^S;
1771 Carp::confess $_[1];#d#TODO: remove when stable
1772 CFClient::fatal $_[0];
1773 };
1325 1774
1326 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1775 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327 CFClient::UI::set_layout ($::CFG->{layout}); 1776 CFClient::UI::set_layout ($::CFG->{layout});
1328 1777
1329 my %DEF_CFG = ( 1778 my %DEF_CFG = (
1330 sdl_mode => 0, 1779 sdl_mode => 0,
1331 width => 640, 1780 width => 640,
… …
1335 map_scale => 1, 1784 map_scale => 1,
1336 fow_enable => 1, 1785 fow_enable => 1,
1337 fow_intensity => 0.45, 1786 fow_intensity => 0.45,
1338 fow_smooth => 0, 1787 fow_smooth => 0,
1339 gui_fontsize => 1, 1788 gui_fontsize => 1,
1340 log_fontsize => 1, 1789 log_fontsize => 0.7,
1341 gauge_fontsize=> 1, 1790 gauge_fontsize=> 1,
1342 gauge_size => 0.35, 1791 gauge_size => 0.35,
1343 stat_fontsize => 1, 1792 stat_fontsize => 0.7,
1344 mapsize => 100, 1793 mapsize => 100,
1345 host => "crossfire.schmorp.de", 1794 host => "crossfire.schmorp.de",
1346 say_command => 'say', 1795 say_command => 'say',
1347 audio_enable => 1, 1796 audio_enable => 1,
1348 bgm_enable => 1, 1797 bgm_enable => 1,
… …
1409 1858
1410END { CFClient::SDL_Quit } 1859END { CFClient::SDL_Quit }
1411 1860
1412=head1 NAME 1861=head1 NAME
1413 1862
1414pclient - A Crossfire+ and Crossfire game client 1863cfplus - A Crossfire+ and Crossfire game client
1415 1864
1416=head1 SYNOPSIS 1865=head1 SYNOPSIS
1417 1866
1418Just run it - no commandline arguments are supported. 1867Just run it - no commandline arguments are supported.
1419 1868
1420=head1 USAGE 1869=head1 USAGE
1421 1870
1422Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1871cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423fullscreen and interactively. 1872fullscreen and interactively.
1424 1873
1874=head1 DEBUGGING
1875
1876
1877CFPLUS_DEBUG - environment variable
1878
1879 1 draw borders around widgets
1880 2 add low-level widget info to tooltips
1881 4 show fps
1882 8 suppress tooltips
1883
1425=head1 AUTHOR 1884=head1 AUTHOR
1426 1885
1427Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1886Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1428 1887
1429 1888

Diff Legend

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