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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.68 by elmex, Mon Jun 12 12:28:06 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
89our $SERVER_INFO;
87 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
88our $FLOORBOX; 99our $FLOORBOX;
89our $GAUGES; 100our $GAUGES;
90our $STATWIDS; 101our $STATWIDS;
91 102
92our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
101our $DEBUG_STATUS; 112our $DEBUG_STATUS;
102 113
103our $INV_WINDOW; 114our $INV_WINDOW;
104our $INV; 115our $INV;
105our $INVR; 116our $INVR;
106our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
107 122
108sub status { 123sub status {
109 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110} 125}
111 126
112sub debug { 127sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
115 $DEBUG_STATUS->move ($WIDTH - $w, 0); 130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 }
161 );
162 $hbox->add (new CFClient::UI::Button
163 text => "Yes",
164 on_activate => sub {
165 $conn->send ("reply y");
166 destroy_query_dialog $conn;
167 },
168 );
169
170 $dialog->focus_in;
171
172 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show;
177
178 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4,
180 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n";
182
183 unshift @dialog, my $table = new CFClient::UI::Table;
184
185 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race",
187 on_activate => sub {
188 $conn->send ("reply n");
189 destroy_query_dialog $conn;
190 },
191 );
192 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept",
194 on_activate => sub {
195 $conn->send ("reply d");
196 destroy_query_dialog $conn;
197 },
198 );
199
200 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, "
210 . "so you can take your time making this important choice."
211 ;
212
213 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat");
216 destroy_query_dialog $conn;
217 return;
218 }
219
220 $STATS_WINDOW->show;
221 $MESSAGE_WINDOW->hide;
222
223 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4,
225 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n";
227
228 unshift @dialog, my $table = new CFClient::UI::Table;
229
230 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again",
233 on_activate => sub {
234 $conn->send ("reply y");
235 destroy_query_dialog $conn;
236 },
237 );
238
239 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
241 value => $_,
242 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
246 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
247 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
248 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250 ],
251 ), 1 .. 2;
252
253 $table->add (2, 0, new CFClient::UI::Button
254 text => "Swap Stats",
255 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn;
259 },
260 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262
263 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept",
266 on_activate => sub {
267 $conn->send ("reply n");
268 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn;
270 },
271 );
272
273 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4,
275 ellipsise => 0,
276 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats "
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281 . "Race selection will influence those values later on."
282 ;
283 }
284
285 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub {
287 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn;
289 },
290 ;
291
292 $entry->focus_in;
293
294 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296
297 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub {
300 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn;
302 },
303 ;
304
305 $entry->focus_in;
306 }
307
308 $vbox->add (@dialog);
309 $dialog->show;
116} 310}
117 311
118sub start_game { 312sub start_game {
119 status "logging in..."; 313 status "logging in...";
120 314
121 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
123 317
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 319
126 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
127 321
… …
139 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
140 logview => $LOGVIEW, 334 logview => $LOGVIEW,
141 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
142 map => $MAP, 336 map => $MAP,
143 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
144 339
145 sound_play => sub { 340 sound_play => sub {
146 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
147 342
148 $SDL_MIXER 343 $SDL_MIXER
… …
165 } 360 }
166} 361}
167 362
168sub stop_game { 363sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
172 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
173 369
174 return unless $CONN; 370 return unless $CONN;
175 371
176 status "connection closed"; 372 status "connection closed";
177 373
374 destroy_query_dialog $CONN;
178 $CONN->destroy; 375 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
180} 377}
181 378
182sub client_setup { 379sub graphics_setup {
183 my $dialog = new CFClient::UI::FancyFrame
184 req_x => 1,
185 req_y => $HEIGHT * (1/8),
186 name => "client_setup",
187 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
381
189 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 382 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
190 383
191 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 384 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
192 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193 386
194 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 387 $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]);
195 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 388 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196 389
197 $mode_slider->connect (changed => sub { 390 $mode_slider->connect (changed => sub {
198 my ($self, $value) = @_; 391 my ($self, $value) = @_;
199 392
… …
316 on_activate => sub { 509 on_activate => sub {
317 video_shutdown (); 510 video_shutdown ();
318 video_init (); 511 video_init ();
319 } 512 }
320 ); 513 );
514
515 $vbox
516}
517
518sub audio_setup {
519 my $vbox = new CFClient::UI::VBox;
520
521 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
522
523 my $row = 0;
321 524
322 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
323 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
324 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
325 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.", 528 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.",
… …
356 audio_shutdown (); 559 audio_shutdown ();
357 audio_init (); 560 audio_init ();
358 } 561 }
359 ); 562 );
360 563
361 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
362 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363 text => $CFG->{say_command},
364 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. "
365 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367 on_changed => sub {
368 my ($self, $value) = @_;
369 $CFG->{say_command} = $value;
370 }
371 );
372
373 $dialog
374} 565}
375 566
376sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
377 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
378 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
387 578
388sub make_gauge_window { 579sub make_gauge_window {
389 my $gh = int $HEIGHT * $CFG->{gauge_size}; 580 my $gh = int $HEIGHT * $CFG->{gauge_size};
390 581
391 my $win = new CFClient::UI::Frame ( 582 my $win = new CFClient::UI::Frame (
392 req_x => 0, 583 force_x => 0,
393 req_y => -1, 584 force_y => "max",
394 def_w => $WIDTH, 585 force_w => $WIDTH,
395 def_h => $gh, 586 force_h => $gh,
396 ); 587 );
397 588
398 $win->add (my $hbox = new CFClient::UI::HBox 589 $win->add (my $hbox = new CFClient::UI::HBox
399 children => [ 590 children => [
400 (new CFClient::UI::HBox expand => 1), 591 (new CFClient::UI::HBox expand => 1),
… …
436 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
437 628
438 $win 629 $win
439} 630}
440 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
634
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
643
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645
646 for my $x (0..2) {
647 for my $y (0 .. 2) {
648 $table->add ($x + 3, $y,
649 new CFClient::UI::Entry
650 text => $default_smooth[$x * 3 + $y],
651 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652 );
653 }
654 }
655
656
657 $table
658}
659
441sub make_stats_window { 660sub stats_window {
442 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
443 req_y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
444 req_x => -1, 663 x => "max",
445 title => "Stats", 664 title => "Stats",
446 name => "stats_window"; 665 name => "stats_window";
447 666
448 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
449 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
451 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
550 update_stats_window ({}); 769 update_stats_window ({});
551 770
552 $tgw 771 $tgw
553} 772}
554 773
555sub formsep { 774sub formsep($) {
556 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
557} 776}
558 777
559sub update_stats_window { 778sub update_stats_window {
560 my ($stats) = @_; 779 my ($stats) = @_;
561 780
… …
623 842
624 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625 for keys %tbl; 844 for keys %tbl;
626} 845}
627 846
628sub metaserver_dialog {
629 my $dialog = new CFClient::UI::FancyFrame
630 title => "Server List",
631 child => (my $vbox = new CFClient::UI::VBox);
632
633 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635 $dialog
636}
637
638my $METASERVER_ATIME; 847my $METASERVER_ATIME;
639 848
640sub update_metaserver { 849sub update_metaserver {
641 my ($HOST) = @_;
642
643 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
644 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
645 852
646 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
647 $table->clear; 854 $table->clear;
… …
668 875
669 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
670 877
671 $table->clear; 878 $table->clear;
672 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
673 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
674 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
675 for 0 .. $#col; 892 for 0 .. $#col;
676 893
677 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
678 895
679 my $y = 0; 896 my $y = 0;
680 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
697 914
698 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
699 916
700 $y++; 917 $y++;
701 918
702 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
703 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
704 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
925 $METASERVER->hide;
926 },
705 }), 927 ),
706 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
707 ]); 929 ]);
708 930
709 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
710 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 932 ellipsise => 0,
933 align => $align[$_],
934 text => $m->[$_],
935 tooltip => $tip[$_],
936 can_hover => 1,
937 can_events => 1,
938 fontsize => 0.8)
711 for 0 .. $#$m; 939 for 0 .. $#$m;
712 } 940 }
713 } 941 }
714 }); 942 });
715} 943}
716 944
717sub server_setup { 945sub metaserver_dialog {
718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
719 x => $WIDTH * (1/3), 947 title => "Server List",
720 y => $HEIGHT * (1/8), 948 name => 'metaserver_dialog',
721 name => "server_setup", 949 x => 'center',
722 title => "Server Setup", 950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
723 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
724 on_visibility_change => sub { 954 on_visibility_change => sub {
725 my ($self, $visible) = @_; 955 update_metaserver if $_[1];
726 $self->center if $visible;
727 }, 956 },
728 ; 957 ;
729 958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog
964}
965
966sub server_setup {
967 my $vbox = new CFClient::UI::VBox;
968
730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732 971
733 { 972 {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 974
736 $vbox->add ( 975 $vbox->add (
737 my $HOST = new CFClient::UI::Entry 976 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 977 expand => 1,
739 text => $CFG->{host}, 978 text => $CFG->{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 980 on_changed => sub {
742 my ($self, $value) = @_; 981 my ($self, $value) = @_;
… …
744 } 983 }
745 ); 984 );
746 985
747 $METASERVER = metaserver_dialog; 986 $METASERVER = metaserver_dialog;
748 987
749 $vbox->add (new CFClient::UI::Flopper 988 $vbox->add (new CFClient::UI::Button
750 expand => 1, 989 expand => 1,
751 text => "Server List", 990 text => "Server List",
752 other => $METASERVER, 991 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
754 on_open => sub { 993 on_activate => sub { $METASERVER->toggle_visibility },
755 update_metaserver $HOST; 994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
756 }
757 ); 995 );
758 } 996 }
759 997
760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
778 } 1016 }
779 ); 1017 );
780 1018
781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1019 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782 $table->add (1, 7, new CFClient::UI::Slider 1020 $table->add (1, 7, new CFClient::UI::Slider
783 req_w => 100, 1021 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1022 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 tooltip => "This is the size of the portion of the map update the server sends you. " 1023 tooltip => "This is the size of the portion of the map update the server sends you. "
786 . "If you set this to a high value you will be able to see further, " 1024 . "If you set this to a high value you will be able to see further, "
787 . "but you also increase bandwidth requirements and latency. " 1025 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1026 . "This option is only used once at log-in.",
… …
828 $CONN ? stop_game 1066 $CONN ? stop_game
829 : start_game; 1067 : start_game;
830 }, 1068 },
831 ); 1069 );
832 1070
833 $dialog 1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 text => $CFG->{say_command},
1074 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. "
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub {
1078 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value;
1080 }
1081 );
1082
1083 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info",
1085 fontsize => 1.2,
1086 padding_y => 8,
1087 fg => [1, 1, 0, 1],
1088 );
1089
1090 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1091
1092 $vbox
834} 1093}
835 1094
836sub message_window { 1095sub message_window {
837 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
838 name => "message_window", 1097 name => "message_window",
839 title => "Messages", 1098 title => "Messages",
840 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
841 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
842 req_x => -1, 1101 x => "max",
843 req_y => 0, 1102 y => 0,
844 def_w => int $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
845 def_h => int $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
846 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
847 1106
848 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
849 1108
850 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
882 }, 1141 },
883 ); 1142 );
884 1143
885 $CONSOLE = { 1144 $CONSOLE = {
886 window => $window, 1145 window => $window,
887 input => $input 1146 input => $input,
888 }; 1147 };
889 1148
890 $window 1149 $window
891} 1150}
892 1151
893sub open_quit_dialog { 1152sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1155 x => "center",
1156 y => "center",
1157 z => 50,
1158 title => "Really Quit?",
1159 ;
896 1160
897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898 1162
899 $vb->add (new CFClient::UI::Label 1163 $vb->add (new CFClient::UI::Label
900 text => "You should find a savebed and apply it first!", 1164 text => "You should find a savebed and apply it first!",
… …
913 on_activate => sub { exit }, 1177 on_activate => sub { exit },
914 ); 1178 );
915 } 1179 }
916 1180
917 $QUIT_DIALOG->show; 1181 $QUIT_DIALOG->show;
918 $QUIT_DIALOG->center;
919} 1182}
920 1183
1184sub autopickup_setup {
1185 my $table = new CFClient::UI::Table;
1186
1187 for (
1188 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG],
1193 ],
1194 ["Weapons", 0, 6,
1195 ["All weapons" => PICKUP_ALLWEAPON],
1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1197 ["Bows" => PICKUP_BOW],
1198 ["Arrows" => PICKUP_ARROW],
1199 ],
1200 ["Armour", 0, 12,
1201 ["Helmets" => PICKUP_HELMET],
1202 ["Shields" => PICKUP_SHIELD],
1203 ["Body Armour" => PICKUP_ARMOUR],
1204 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK],
1207 ],
1208
1209 ["Readables", 2, 2,
1210 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ],
1214 ["Misc", 2, 7,
1215 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
1226 )
1227 {
1228 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230
1231 for (@bits) {
1232 ++$y;
1233
1234 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask,
1238 on_changed => sub {
1239 my ($box, $value) = @_;
1240
1241 if ($value) {
1242 $::CFG->{pickup} |= $mask;
1243 } else {
1244 $::CFG->{pickup} &= ~$mask;
1245 }
1246
1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN;
1249 });
1250 }
1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 1;
1270 });
1271
1272 $table
1273}
1274
921sub make_inventory_window { 1275sub inventory_window {
922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center",
1278 y => "center",
923 def_w => $WIDTH * 7/8, 1279 force_w => $WIDTH * 9/10,
924 def_h => $HEIGHT * 7/8, 1280 force_h => $HEIGHT * 9/10,
925 title => "Inventory", 1281 title => "Inventory",
926 name => "inventory_window",
927 on_visibility_change => sub {
928 my ($self, $visible) = @_;
929 $self->center if $visible;
930 },
931 ; 1282 ;
932 1283
933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934 1285
935 $hb->add (my $vb1 = new CFClient::UI::VBox); 1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938 1289
939 $hb->add (my $vb2 = new CFClient::UI::VBox); 1290 $hb->add (my $vb2 = new CFClient::UI::VBox);
940 1291
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1293
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1295
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300}
1301
1302sub spell_setup {
1303 new CFClient::UI::SpellList
1304}
1305
1306sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox;
1308
1309 my $refresh;
1310 $refresh = sub {
1311 $binding_list->clear ();
1312
1313 for my $mod (keys %{$::CFG->{bindings}}) {
1314 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1315 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317
1318 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1321 $hb->add (new CFClient::UI::Button
1322 text => "delete",
1323 tooltip => "Deletes the binding",
1324 on_activate => sub {
1325 $binding_list->remove ($hb);
1326 delete $::CFG->{bindings}->{$mod}->{$sym};
1327 });
1328
1329 $hb->add (new CFClient::UI::Button
1330 text => "edit",
1331 tooltip => "Edits the binding",
1332 on_activate => sub {
1333 $::BIND_EDITOR->set_binding (
1334 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1335 sub {
1336 my ($nmod, $nsym, $ncmds) = @_;
1337 delete $::CFG->{bindings}->{$mod}->{$sym};
1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
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 $::BIND_EDITOR->show;
1348 $SETUP_DIALOG->hide;
1349 });
1350
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353 }
1354 }
1355 };
1356
1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add ($binding_list);
941 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1359 $vb->add (my $hb = new CFClient::UI::HBox);
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 1360
943 $hb2->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
944 text => "Close", 1362 text => "record new",
945 tooltip => "Close the currently open container (if one is open)", 1363 expand => 1,
1364 tooltip => "This button opens the binding editor with an empty binding.",
946 on_activate => sub { 1365 on_activate => sub {
947 $CONN->send ("apply $CONN->{open_container}") 1366 $::BIND_EDITOR->set_binding (undef, undef, [],
948 if $CONN->{open_container} != 0; 1367 sub {
1368 my ($mod, $sym, $cmds) = @_;
1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1370 $refresh->();
1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show;
1373 },
1374 sub {
1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1377 },
1378 );
1379 $SETUP_DIALOG->hide;
1380 $::BIND_EDITOR->show;
949 }, 1381 },
950 ); 1382 );
951 1383
952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1384 $hb->add (new CFClient::UI::Button
1385 text => "close",
1386 tooltip => "Closes the binding window",
1387 expand => 1,
1388 on_activate => sub {
1389 $SETUP_DIALOG->hide;
1390 }
1391 );
953 1392
954 $invwin 1393 $refresh->();
955}
956 1394
1395 $vb
1396}
1397
957sub make_help_window { 1398sub help_window {
958 my $win = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
1400 x => 'center',
1401 y => 'center',
1402 z => 2,
1403 name => 'doc_browser',
959 def_w => int $WIDTH * 7/8, 1404 force_w => int $WIDTH * 7/8,
960 def_h => int $HEIGHT * 7/8, 1405 force_h => int $HEIGHT * 7/8,
961 title => "Documentation"; 1406 title => "Documentation";
962 1407
963 $win->add (my $vbox = new CFClient::UI::VBox); 1408 $win->add (my $vbox = new CFClient::UI::VBox);
964 1409
965 $vbox->add (my $buttons = new CFClient::UI::HBox); 1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
966 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4);
967 1413
968 for ( 1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox
1416 value => undef,
1417 options => [
969 [intro => "Introduction"], 1418 [intro => "Introduction"],
970 [manual => "Manual"], 1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
971 [command_help => "Commands"], 1421 [command_help => "Commands"],
972 [skill_help => "Skills"], 1422 [dmcommand_help => "DM Commands"],
973 ) { 1423 [COPYING => "License Terms"],
974 my ($pod, $label) = @$_; 1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
975 1427
976 $buttons->add (new CFClient::UI::Button 1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
977 text => $label, 1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
978 on_activate => sub {
979 my $parser = new Pod::POM;
980 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
981 1430
982 $viewer->clear; 1431 $viewer->clear;
983 1432
984 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
985 for @{ CFClient::pod_to_pango_list $pom }; 1434 for @$pom;
986 1435
987 $viewer->set_offset (0); 1436 $viewer->set_offset (0);
988 }, 1437 },
1438 on_visibility_change => sub {
1439 my ($self, $visible) = @_;
1440 return unless $visible;
1441 return if $self->{value};
1442 $self->set_value ("intro");
1443 },
989 ); 1444 );
990 }
991
992 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
993 1445
994 $win 1446 $win
995} 1447}
996 1448
997sub sdl_init { 1449sub sdl_init {
… …
1027 if ($DEBUG_STATUS) { 1479 if ($DEBUG_STATUS) {
1028 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1480 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029 } else { 1481 } else {
1030 # create the widgets 1482 # create the widgets
1031 1483
1032 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1484 $DEBUG_STATUS = new CFClient::UI::Label
1485 padding => 0,
1486 z => 100,
1487 force_x => "max",
1488 force_y => 0;
1033 $DEBUG_STATUS->show; 1489 $DEBUG_STATUS->show;
1034 1490
1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1492
1035 $STATUSBOX = new CFClient::UI::Statusbox; 1493 $STATUSBOX = new CFClient::UI::Statusbox;
1036 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1037 1495
1038 (new CFClient::UI::Frame 1496 (new CFClient::UI::Frame
1039 bg => [0, 0, 0, 0.4], 1497 bg => [0, 0, 0, 0.4],
1040 req_y => -1, 1498 force_x => 0,
1499 force_y => "max",
1041 child => $STATUSBOX, 1500 child => $STATUSBOX,
1042 )->show; 1501 )->show;
1043 1502
1044 CFClient::UI::FancyFrame->new ( 1503 CFClient::UI::FancyFrame->new (
1504 title => "Map",
1505 name => "mapmap",
1506 x => 0,
1507 y => $FONTSIZE + 8,
1045 border_bg => [1, 1, 1, 192/255], 1508 border_bg => [1, 1, 1, 192/255],
1046 bg => [1, 1, 1, 0], 1509 bg => [1, 1, 1, 0],
1047 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1510 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1511 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049 ), 1512 ),
… …
1063 } 1526 }
1064 }); 1527 });
1065 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1066 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1067 1530
1068 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1069 expand => 1, 1532 expand => 1,
1070 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1071 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1072 can_hover => 1, 1536 can_hover => 1,
1073 can_events => 1, 1537 can_events => 1,
1074 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075 ; 1539 ;
1076 1540
1077 $BUTTONBAR = new CFClient::UI::HBox; 1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1542 title => "Setup",
1543 name => "setup_dialog",
1544 x => 'center',
1545 y => 'center',
1546 z => 2,
1547 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6,
1549 ;
1078 1550
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555 "Configure the server to play on, your username, password and other server-related options.");
1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask.");
1573
1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1080 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1577 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1578
1082 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1083 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1579 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1084 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085 1581
1086 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 1582 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
1087 1583
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1584 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1089 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1585 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1586 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1091 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1587 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1092 1589
1093 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1094 text => "Save Config", 1591 text => "Save Config",
1095 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1592 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096 on_activate => sub { 1593 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout; 1594 $::CFG->{layout} = CFClient::UI::get_layout;
1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099 status "Configuration Saved"; 1596 status "Configuration Saved";
1100 }, 1597 },
1101 ); 1598 );
1102 1599
1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1104 tooltip => "View Documentation"); 1601 tooltip => "View Documentation");
1105 1602
1106 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1107 text => "Quit", 1604 text => "Quit",
1108 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
… …
1114 } 1611 }
1115 }, 1612 },
1116 ); 1613 );
1117 1614
1118 $BUTTONBAR->show; 1615 $BUTTONBAR->show;
1119 1616 $SETUP_DIALOG->show;
1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122 $SERVER_SETUP->show;
1123 } 1617 }
1618
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124} 1620}
1125 1621
1126sub video_shutdown { 1622sub video_shutdown {
1127 undef $SDL_ACTIVE; 1623 undef $SDL_ACTIVE;
1128} 1624}
… …
1195 1691
1196my %demo;#d# 1692my %demo;#d#
1197 1693
1198sub force_refresh { 1694sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1695 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1696 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1697
1202 $CFClient::UI::ROOT->draw; 1698 $CFClient::UI::ROOT->draw;
1203 1699
1204 $WANT_REFRESH = 0; 1700 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1701 $CAN_REFRESH = 0;
… …
1260}; 1756};
1261 1757
1262 CFClient::SDL_GL_SwapBuffers; 1758 CFClient::SDL_GL_SwapBuffers;
1263} 1759}
1264 1760
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 1762 $NOW = time;
1267 1763
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1764 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1765 for CFClient::SDL_PollEvent;
1270 1766
… …
1337############################################################################# 1833#############################################################################
1338 1834
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1835$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1836
1341{ 1837{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1838 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable
1841 CFClient::fatal $_[0];
1842 };
1343 1843
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1845 CFClient::UI::set_layout ($::CFG->{layout});
1346 1846
1347 my %DEF_CFG = ( 1847 my %DEF_CFG = (
1348 sdl_mode => 0, 1848 sdl_mode => 0,
1349 width => 640, 1849 width => 640,
… …
1353 map_scale => 1, 1853 map_scale => 1,
1354 fow_enable => 1, 1854 fow_enable => 1,
1355 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1356 fow_smooth => 0, 1856 fow_smooth => 0,
1357 gui_fontsize => 1, 1857 gui_fontsize => 1,
1358 log_fontsize => 1, 1858 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1360 gauge_size => 0.35, 1860 gauge_size => 0.35,
1361 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1362 mapsize => 100, 1862 mapsize => 100,
1363 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1364 say_command => 'say', 1864 say_command => 'say',
1365 audio_enable => 1, 1865 audio_enable => 1,
1366 bgm_enable => 1, 1866 bgm_enable => 1,
1367 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1368 face_prefetch => 0, 1868 face_prefetch => 0,
1369 output_sync => 1, 1869 output_sync => 1,
1370 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1371 ); 1872 );
1372 1873
1373 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 1876 }
… …
1427 1928
1428END { CFClient::SDL_Quit } 1929END { CFClient::SDL_Quit }
1429 1930
1430=head1 NAME 1931=head1 NAME
1431 1932
1432pclient - A Crossfire+ and Crossfire game client 1933cfplus - A Crossfire+ and Crossfire game client
1433 1934
1434=head1 SYNOPSIS 1935=head1 SYNOPSIS
1435 1936
1436Just run it - no commandline arguments are supported. 1937Just run it - no commandline arguments are supported.
1437 1938
1438=head1 USAGE 1939=head1 USAGE
1439 1940
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1941cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1942fullscreen and interactively.
1442 1943
1944=head1 DEBUGGING
1945
1946
1947CFPLUS_DEBUG - environment variable
1948
1949 1 draw borders around widgets
1950 2 add low-level widget info to tooltips
1951 4 show fps
1952 8 suppress tooltips
1953
1443=head1 AUTHOR 1954=head1 AUTHOR
1444 1955
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1956Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1957
1447 1958

Diff Legend

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