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.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.65 by root, Thu Jun 8 01:51:32 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 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "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_x => 0, 581 force_x => 0,
391 req_y => -1, 582 force_y => "max",
392 def_w => $WIDTH, 583 force_w => $WIDTH,
393 def_h => $gh, 584 force_h => $gh,
394 ); 585 );
395 586
396 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
397 children => [ 588 children => [
398 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
434 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
435 626
436 $win 627 $win
437} 628}
438 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
632
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
641
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643
644 for my $x (0..2) {
645 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry
648 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 );
651 }
652 }
653
654
655 $table
656}
657
439sub make_stats_window { 658sub stats_window {
440 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
441 req_y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
442 req_x => -1, 661 x => "max",
443 title => "Stats", 662 title => "Stats",
444 name => "stats_window"; 663 name => "stats_window";
445 664
446 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448 can_hover => 1, can_events => 1, 667 can_hover => 1, can_events => 1,
449 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
548 update_stats_window ({}); 767 update_stats_window ({});
549 768
550 $tgw 769 $tgw
551} 770}
552 771
553sub formsep { 772sub formsep($) {
554 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
555} 774}
556 775
557sub update_stats_window { 776sub update_stats_window {
558 my ($stats) = @_; 777 my ($stats) = @_;
559 778
… …
621 840
622 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623 for keys %tbl; 842 for keys %tbl;
624} 843}
625 844
626sub metaserver_dialog {
627 my $dialog = new CFClient::UI::FancyFrame
628 title => "Server List",
629 child => (my $vbox = new CFClient::UI::VBox);
630
631 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633 $dialog
634}
635
636my $METASERVER_ATIME; 845my $METASERVER_ATIME;
637 846
638sub update_metaserver { 847sub update_metaserver {
639 my ($HOST) = @_;
640
641 return if $METASERVER_ATIME > time; 848 return if $METASERVER_ATIME > time;
642 $METASERVER_ATIME = time + 60; 849 $METASERVER_ATIME = time + 60;
643 850
644 my $table = $METASERVER->{table}; 851 my $table = $METASERVER->{table};
645 $table->clear; 852 $table->clear;
… …
666 873
667 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
668 875
669 $table->clear; 876 $table->clear;
670 877
878 my @tip = (
879 "The current number of users logged in on the server.",
880 "The hostname of the server.",
881 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.",
884 );
671 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
672 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 886 $table->add ($_, 0, new CFClient::UI::Label
887 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_])
673 for 0 .. $#col; 890 for 0 .. $#col;
674 891
675 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
676 893
677 my $y = 0; 894 my $y = 0;
678 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
695 912
696 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
697 914
698 $y++; 915 $y++;
699 916
700 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
701 (new CFClient::UI::Button text => "Use", on_activate => sub { 918 (new CFClient::UI::Button
919 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub {
702 $HOST->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
923 $METASERVER->hide;
924 },
703 }), 925 ),
704 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
705 ]); 927 ]);
706 928
707 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
708 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 930 ellipsise => 0,
931 align => $align[$_],
932 text => $m->[$_],
933 tooltip => $tip[$_],
934 can_hover => 1,
935 can_events => 1,
936 fontsize => 0.8)
709 for 0 .. $#$m; 937 for 0 .. $#$m;
710 } 938 }
711 } 939 }
712 }); 940 });
713} 941}
714 942
715sub server_setup { 943sub metaserver_dialog {
716 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
717 x => $WIDTH * (1/3), 945 title => "Server List",
718 y => $HEIGHT * (1/8), 946 name => 'metaserver_dialog',
719 name => "server_setup", 947 x => 'center',
720 title => "Server Setup", 948 y => 'center',
949 z => 3,
950 force_h => $::HEIGHT * 0.4,
721 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
722 on_visibility_change => sub { 952 on_visibility_change => sub {
723 my ($self, $visible) = @_; 953 update_metaserver if $_[1];
724 $self->center if $visible;
725 }, 954 },
726 ; 955 ;
727 956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960
961 $dialog
962}
963
964sub server_setup {
965 my $vbox = new CFClient::UI::VBox;
966
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 967 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 968 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730 969
731 { 970 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 972
734 $vbox->add ( 973 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 974 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 975 expand => 1,
737 text => $CFG->{host}, 976 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 978 on_changed => sub {
740 my ($self, $value) = @_; 979 my ($self, $value) = @_;
… …
742 } 981 }
743 ); 982 );
744 983
745 $METASERVER = metaserver_dialog; 984 $METASERVER = metaserver_dialog;
746 985
747 $vbox->add (new CFClient::UI::Flopper 986 $vbox->add (new CFClient::UI::Button
748 expand => 1, 987 expand => 1,
749 text => "Server List", 988 text => "Server List",
750 other => $METASERVER, 989 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 991 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST; 992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
754 }
755 ); 993 );
756 } 994 }
757 995
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
776 } 1014 }
777 ); 1015 );
778 1016
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1017 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1018 $table->add (1, 7, new CFClient::UI::Slider
781 req_w => 100, 1019 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1020 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1021 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1022 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1023 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1024 . "This option is only used once at log-in.",
… …
826 $CONN ? stop_game 1064 $CONN ? stop_game
827 : start_game; 1065 : start_game;
828 }, 1066 },
829 ); 1067 );
830 1068
831 $dialog 1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1071 text => $CFG->{say_command},
1072 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. "
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub {
1076 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value;
1078 }
1079 );
1080
1081 $vbox
832} 1082}
833 1083
834sub message_window { 1084sub message_window {
835 my $window = new CFClient::UI::FancyFrame 1085 my $window = new CFClient::UI::FancyFrame
836 name => "message_window", 1086 name => "message_window",
837 title => "Messages", 1087 title => "Messages",
838 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
839 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
840 req_x => -1, 1090 x => "max",
841 req_y => 0, 1091 y => 0,
842 def_w => int $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
843 def_h => int $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
844 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
845 1095
846 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
847 1097
848 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
880 }, 1130 },
881 ); 1131 );
882 1132
883 $CONSOLE = { 1133 $CONSOLE = {
884 window => $window, 1134 window => $window,
885 input => $input 1135 input => $input,
886 }; 1136 };
887 1137
888 $window 1138 $window
889} 1139}
890 1140
891sub open_quit_dialog { 1141sub open_quit_dialog {
892 unless ($QUIT_DIALOG) { 1142 unless ($QUIT_DIALOG) {
893 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1144 x => "center",
1145 y => "center",
1146 z => 50,
1147 title => "Really Quit?",
1148 ;
894 1149
895 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896 1151
897 $vb->add (new CFClient::UI::Label 1152 $vb->add (new CFClient::UI::Label
898 text => "You should find a savebed and apply it first!", 1153 text => "You should find a savebed and apply it first!",
… …
911 on_activate => sub { exit }, 1166 on_activate => sub { exit },
912 ); 1167 );
913 } 1168 }
914 1169
915 $QUIT_DIALOG->show; 1170 $QUIT_DIALOG->show;
916 $QUIT_DIALOG->center;
917} 1171}
918 1172
1173sub autopickup_setup {
1174 my $table = new CFClient::UI::Table;
1175
1176 for (
1177 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG],
1182 ],
1183 ["Weapons", 0, 6,
1184 ["All weapons" => PICKUP_ALLWEAPON],
1185 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1186 ["Bows" => PICKUP_BOW],
1187 ["Arrows" => PICKUP_ARROW],
1188 ],
1189 ["Armour", 0, 12,
1190 ["Helmets" => PICKUP_HELMET],
1191 ["Shields" => PICKUP_SHIELD],
1192 ["Body Armour" => PICKUP_ARMOUR],
1193 ["Boots" => PICKUP_BOOTS],
1194 ["Gloves" => PICKUP_GLOVES],
1195 ["Cloaks" => PICKUP_CLOAK],
1196 ],
1197
1198 ["Readables", 2, 2,
1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1202 ],
1203 ["Misc", 2, 7,
1204 ["Food" => PICKUP_FOOD],
1205 ["Drinks" => PICKUP_DRINK],
1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1207 ["Keys" => PICKUP_KEY],
1208 ["Magical Items" => PICKUP_MAGICAL],
1209 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS],
1213 ],
1214 )
1215 {
1216 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218
1219 for (@bits) {
1220 ++$y;
1221
1222 my $mask = $_->[1];
1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1225 state => $CFG->{pickup} & $mask,
1226 on_changed => sub {
1227 my ($box, $value) = @_;
1228
1229 if ($value) {
1230 $::CFG->{pickup} |= $mask;
1231 } else {
1232 $::CFG->{pickup} &= ~$mask;
1233 }
1234
1235 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN;
1237 });
1238 }
1239 }
1240
1241 $table
1242}
1243
919sub make_inventory_window { 1244sub inventory_window {
920 my $invwin = new CFClient::UI::FancyFrame 1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1246 x => "center",
1247 y => "center",
921 def_w => $WIDTH * 7/8, 1248 force_w => $WIDTH * 9/10,
922 def_h => $HEIGHT * 7/8, 1249 force_h => $HEIGHT * 9/10,
923 title => "Inventory", 1250 title => "Inventory",
924 name => "inventory_window",
925 on_visibility_change => sub {
926 my ($self, $visible) = @_;
927 $self->center if $visible;
928 },
929 ; 1251 ;
930 1252
931 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1253 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932 1254
933 $hb->add (my $vb1 = new CFClient::UI::VBox); 1255 $hb->add (my $vb1 = new CFClient::UI::VBox);
934 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1256 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1257 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936 1258
937 $hb->add (my $vb2 = new CFClient::UI::VBox); 1259 $hb->add (my $vb2 = new CFClient::UI::VBox);
938 1260
1261 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1262
1263 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1264
1265 # XXX: Call after $INVR = ... because set_opencont sets the items
1266 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1267
1268 $invwin
1269}
1270
1271sub spell_setup {
1272 new CFClient::UI::SpellList
1273}
1274
1275sub keyboard_setup {
1276 my $binding_list = new CFClient::UI::VBox;
1277
1278 my $refresh;
1279 $refresh = sub {
1280 $binding_list->clear ();
1281
1282 for my $mod (keys %{$::CFG->{bindings}}) {
1283 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1284 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1285 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1286
1287 my $lbl = join "; ", @$cmds;
1288 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1289 $binding_list->add (my $hb = new CFClient::UI::HBox);
1290 $hb->add (new CFClient::UI::Button
1291 text => "delete",
1292 tooltip => "Deletes the binding",
1293 on_activate => sub {
1294 $binding_list->remove ($hb);
1295 delete $::CFG->{bindings}->{$mod}->{$sym};
1296 });
1297
1298 $hb->add (new CFClient::UI::Button
1299 text => "edit",
1300 tooltip => "Edits the binding",
1301 on_activate => sub {
1302 $::BIND_EDITOR->set_binding (
1303 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1304 sub {
1305 my ($nmod, $nsym, $ncmds) = @_;
1306 delete $::CFG->{bindings}->{$mod}->{$sym};
1307 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1308 $refresh->();
1309 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1310 $SETUP_DIALOG->show;
1311 },
1312 sub {
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show;
1315 });
1316 $::BIND_EDITOR->show;
1317 $SETUP_DIALOG->hide;
1318 });
1319
1320 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1321 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1322 }
1323 }
1324 };
1325
1326 my $vb = new CFClient::UI::VBox;
1327 $vb->add ($binding_list);
939 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1328 $vb->add (my $hb = new CFClient::UI::HBox);
940 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 1329
941 $hb2->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
942 text => "Close", 1331 text => "record new",
943 tooltip => "Close the currently open container (if one is open)", 1332 expand => 1,
1333 tooltip => "This button opens the binding editor with an empty binding.",
944 on_activate => sub { 1334 on_activate => sub {
945 $CONN->send ("apply $CONN->{open_container}") 1335 $::BIND_EDITOR->set_binding (undef, undef, [],
946 if $CONN->{open_container} != 0; 1336 sub {
1337 my ($mod, $sym, $cmds) = @_;
1338 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1339 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341 $SETUP_DIALOG->show;
1342 },
1343 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345 $SETUP_DIALOG->show;
1346 },
1347 );
1348 $SETUP_DIALOG->hide;
1349 $::BIND_EDITOR->show;
947 }, 1350 },
948 ); 1351 );
949 1352
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1353 $hb->add (new CFClient::UI::Button
1354 text => "close",
1355 tooltip => "Closes the binding window",
1356 expand => 1,
1357 on_activate => sub {
1358 $SETUP_DIALOG->hide;
1359 }
1360 );
951 1361
952 $invwin 1362 $refresh->();
953}
954 1363
1364 $vb
1365}
1366
955sub make_help_window { 1367sub help_window {
956 my $win = new CFClient::UI::FancyFrame 1368 my $win = new CFClient::UI::FancyFrame
1369 x => 'center',
1370 y => 'center',
1371 z => 2,
1372 name => 'doc_browser',
957 def_w => int $WIDTH * 7/8, 1373 force_w => int $WIDTH * 7/8,
958 def_h => int $HEIGHT * 7/8, 1374 force_h => int $HEIGHT * 7/8,
959 title => "Documentation"; 1375 title => "Documentation";
960 1376
961 $win->add (my $vbox = new CFClient::UI::VBox); 1377 $win->add (my $vbox = new CFClient::UI::VBox);
962 1378
963 $vbox->add (my $buttons = new CFClient::UI::HBox); 1379 $vbox->add (my $buttons = new CFClient::UI::HBox);
964 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1381 expand => 1, fontsize => 0.8, padding_x => 4);
965 1382
966 for ( 1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef,
1386 options => [
967 [intro => "Introduction"], 1387 [intro => "Introduction"],
968 [manual => "Manual"], 1388 [manual => "Manual"],
1389 [skill_help => "Skills"],
969 [command_help => "Commands"], 1390 [command_help => "Commands"],
970 [skill_help => "Skills"], 1391 [dmcommand_help => "DM Commands"],
971 ) { 1392 [COPYING => "License Terms"],
972 my ($pod, $label) = @$_; 1393 ],
1394 on_changed => sub {
1395 my ($self, $pod) = @_;
973 1396
974 $buttons->add (new CFClient::UI::Button 1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
975 text => $label, 1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
976 on_activate => sub {
977 my $parser = new Pod::POM;
978 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
979 1399
980 $viewer->clear; 1400 $viewer->clear;
981 1401
982 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983 for @{ CFClient::pod_to_pango_list $pom }; 1403 for @$pom;
984 1404
985 $viewer->set_offset (0); 1405 $viewer->set_offset (0);
986 }, 1406 },
1407 on_visibility_change => sub {
1408 my ($self, $visible) = @_;
1409 return unless $visible;
1410 return if $self->{value};
1411 $self->set_value ("intro");
1412 },
987 ); 1413 );
988 }
989
990 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
991 1414
992 $win 1415 $win
993} 1416}
994 1417
995sub sdl_init { 1418sub sdl_init {
… …
1025 if ($DEBUG_STATUS) { 1448 if ($DEBUG_STATUS) {
1026 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1449 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027 } else { 1450 } else {
1028 # create the widgets 1451 # create the widgets
1029 1452
1030 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1453 $DEBUG_STATUS = new CFClient::UI::Label
1454 padding => 0,
1455 z => 100,
1456 force_x => "max",
1457 force_y => 0;
1031 $DEBUG_STATUS->show; 1458 $DEBUG_STATUS->show;
1032 1459
1460 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1461
1033 $STATUSBOX = new CFClient::UI::Statusbox; 1462 $STATUSBOX = new CFClient::UI::Statusbox;
1034 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1463 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1035 1464
1036 (new CFClient::UI::Frame 1465 (new CFClient::UI::Frame
1037 bg => [0, 0, 0, 0.4], 1466 bg => [0, 0, 0, 0.4],
1038 req_y => -1, 1467 force_x => 0,
1468 force_y => "max",
1039 child => $STATUSBOX, 1469 child => $STATUSBOX,
1040 )->show; 1470 )->show;
1041 1471
1042 CFClient::UI::FancyFrame->new ( 1472 CFClient::UI::FancyFrame->new (
1473 title => "Map",
1474 name => "mapmap",
1475 x => 0,
1476 y => $FONTSIZE + 8,
1043 border_bg => [1, 1, 1, 192/255], 1477 border_bg => [1, 1, 1, 192/255],
1044 bg => [1, 1, 1, 0], 1478 bg => [1, 1, 1, 0],
1045 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1479 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1480 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047 ), 1481 ),
… …
1061 } 1495 }
1062 }); 1496 });
1063 $MAPWIDGET->show; 1497 $MAPWIDGET->show;
1064 $MAPWIDGET->focus_in; 1498 $MAPWIDGET->focus_in;
1065 1499
1066 $LOGVIEW = new CFClient::UI::TextView 1500 $LOGVIEW = new CFClient::UI::TextScroller
1067 expand => 1, 1501 expand => 1,
1068 font => $FONT_FIXED, 1502 font => $FONT_FIXED,
1069 fontsize => $::CFG->{log_fontsize}, 1503 fontsize => $::CFG->{log_fontsize},
1504 indent => -4,
1070 can_hover => 1, 1505 can_hover => 1,
1071 can_events => 1, 1506 can_events => 1,
1072 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1507 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073 ; 1508 ;
1074 1509
1075 $BUTTONBAR = new CFClient::UI::HBox; 1510 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1511 title => "Setup",
1512 name => "setup_dialog",
1513 x => 'center',
1514 y => 'center',
1515 z => 2,
1516 force_w => $::WIDTH * 0.6,
1517 force_h => $::HEIGHT * 0.6,
1518 ;
1076 1519
1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1522
1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1524 "Configure the server to play on, your username, password and other server-related options.");
1525 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1526 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1527 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1528 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1529 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1530 "Configure the use of audio, sound effects and background music.");
1531 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1532 "Lets you define, edit and delete bindings."
1533 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1534 . "with nothing set and the recording started. After doing the actions you "
1535 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1536 . "After pressing the combo the binding will be saved automatically and the "
1537 . "binding editor closes");
1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask.");
1542
1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1544
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1078 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1546 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1547
1080 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1548 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1082 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083 1550
1084 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 1551 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
1085 1552
1086 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1553 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1087 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1554 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1089 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1556 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1090 1558
1091 $BUTTONBAR->add (new CFClient::UI::Button 1559 $BUTTONBAR->add (new CFClient::UI::Button
1092 text => "Save Config", 1560 text => "Save Config",
1093 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1561 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094 on_activate => sub { 1562 on_activate => sub {
1095 $::CFG->{layout} = CFClient::UI::get_layout; 1563 $::CFG->{layout} = CFClient::UI::get_layout;
1096 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097 status "Configuration Saved"; 1565 status "Configuration Saved";
1098 }, 1566 },
1099 ); 1567 );
1100 1568
1101 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1102 tooltip => "View Documentation"); 1570 tooltip => "View Documentation");
1103 1571
1104 $BUTTONBAR->add (new CFClient::UI::Button 1572 $BUTTONBAR->add (new CFClient::UI::Button
1105 text => "Quit", 1573 text => "Quit",
1106 tooltip => "Terminates the program", 1574 tooltip => "Terminates the program",
… …
1112 } 1580 }
1113 }, 1581 },
1114 ); 1582 );
1115 1583
1116 $BUTTONBAR->show; 1584 $BUTTONBAR->show;
1117 1585 $SETUP_DIALOG->show;
1118 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1121 } 1586 }
1587
1588 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1122} 1589}
1123 1590
1124sub video_shutdown { 1591sub video_shutdown {
1125 undef $SDL_ACTIVE; 1592 undef $SDL_ACTIVE;
1126} 1593}
… …
1193 1660
1194my %demo;#d# 1661my %demo;#d#
1195 1662
1196sub force_refresh { 1663sub force_refresh {
1197 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1664 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1198 debug sprintf "%3.2f", $fps; 1665 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1199 1666
1200 $CFClient::UI::ROOT->draw; 1667 $CFClient::UI::ROOT->draw;
1201 1668
1202 $WANT_REFRESH = 0; 1669 $WANT_REFRESH = 0;
1203 $CAN_REFRESH = 0; 1670 $CAN_REFRESH = 0;
… …
1258}; 1725};
1259 1726
1260 CFClient::SDL_GL_SwapBuffers; 1727 CFClient::SDL_GL_SwapBuffers;
1261} 1728}
1262 1729
1263my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1730my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1264 $NOW = time; 1731 $NOW = time;
1265 1732
1266 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1733 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1267 for CFClient::SDL_PollEvent; 1734 for CFClient::SDL_PollEvent;
1268 1735
… …
1335############################################################################# 1802#############################################################################
1336 1803
1337$SIG{INT} = $SIG{TERM} = sub { exit }; 1804$SIG{INT} = $SIG{TERM} = sub { exit };
1338 1805
1339{ 1806{
1340 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1807 local $SIG{__DIE__} = sub {
1808 return unless defined $^S && !$^S;
1809 Carp::confess $_[1];#d#TODO: remove when stable
1810 CFClient::fatal $_[0];
1811 };
1341 1812
1342 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1813 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1343 CFClient::UI::set_layout ($::CFG->{layout}); 1814 CFClient::UI::set_layout ($::CFG->{layout});
1344 1815
1345 my %DEF_CFG = ( 1816 my %DEF_CFG = (
1346 sdl_mode => 0, 1817 sdl_mode => 0,
1347 width => 640, 1818 width => 640,
… …
1351 map_scale => 1, 1822 map_scale => 1,
1352 fow_enable => 1, 1823 fow_enable => 1,
1353 fow_intensity => 0.45, 1824 fow_intensity => 0.45,
1354 fow_smooth => 0, 1825 fow_smooth => 0,
1355 gui_fontsize => 1, 1826 gui_fontsize => 1,
1356 log_fontsize => 1, 1827 log_fontsize => 0.7,
1357 gauge_fontsize=> 1, 1828 gauge_fontsize=> 1,
1358 gauge_size => 0.35, 1829 gauge_size => 0.35,
1359 stat_fontsize => 1, 1830 stat_fontsize => 0.7,
1360 mapsize => 100, 1831 mapsize => 100,
1361 host => "crossfire.schmorp.de", 1832 host => "crossfire.schmorp.de",
1362 say_command => 'say', 1833 say_command => 'say',
1363 audio_enable => 1, 1834 audio_enable => 1,
1364 bgm_enable => 1, 1835 bgm_enable => 1,
1365 bgm_volume => 0.25, 1836 bgm_volume => 0.25,
1366 face_prefetch => 0, 1837 face_prefetch => 0,
1367 output_sync => 1, 1838 output_sync => 1,
1368 output_count => 1, 1839 output_count => 1,
1840 pickup => 0,
1369 ); 1841 );
1370 1842
1371 while (my ($k, $v) = each %DEF_CFG) { 1843 while (my ($k, $v) = each %DEF_CFG) {
1372 $CFG->{$k} = $v unless exists $CFG->{$k}; 1844 $CFG->{$k} = $v unless exists $CFG->{$k};
1373 } 1845 }
… …
1425 1897
1426END { CFClient::SDL_Quit } 1898END { CFClient::SDL_Quit }
1427 1899
1428=head1 NAME 1900=head1 NAME
1429 1901
1430pclient - A Crossfire+ and Crossfire game client 1902cfplus - A Crossfire+ and Crossfire game client
1431 1903
1432=head1 SYNOPSIS 1904=head1 SYNOPSIS
1433 1905
1434Just run it - no commandline arguments are supported. 1906Just run it - no commandline arguments are supported.
1435 1907
1436=head1 USAGE 1908=head1 USAGE
1437 1909
1438Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1910cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1439fullscreen and interactively. 1911fullscreen and interactively.
1440 1912
1913=head1 DEBUGGING
1914
1915
1916CFPLUS_DEBUG - environment variable
1917
1918 1 draw borders around widgets
1919 2 add low-level widget info to tooltips
1920 4 show fps
1921 8 suppress tooltips
1922
1441=head1 AUTHOR 1923=head1 AUTHOR
1442 1924
1443Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1925Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1444 1926
1445 1927

Diff Legend

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