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.66 by elmex, Thu Jun 8 19:43:26 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 ["Weight/Value ratio", 2, 17]
1215 )
1216 {
1217 my ($title, $x, $y, @bits) = @$_;
1218 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1219
1220 for (@bits) {
1221 ++$y;
1222
1223 my $mask = $_->[1];
1224 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1225 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1226 state => $CFG->{pickup} & $mask,
1227 on_changed => sub {
1228 my ($box, $value) = @_;
1229
1230 if ($value) {
1231 $::CFG->{pickup} |= $mask;
1232 } else {
1233 $::CFG->{pickup} &= ~$mask;
1234 }
1235
1236 $::CONN->send_command ("pickup $::CFG->{pickup}")
1237 if defined $::CONN;
1238 });
1239 }
1240 }
1241
1242 $table->add (2, 18, new CFClient::UI::ValSlider
1243 range => [0, 0, 16, 1, 1],
1244 to_value => sub { ">= " . 5 * $_[0] },
1245 on_changed => sub {
1246 my ($slider, $value) = @_;
1247
1248 $::CFG->{pickup} &= ~0x7;
1249 $::CFG->{pickup} |= int $value
1250 if $value;
1251 1;
1252 });
1253 $table->add (3, 18, new CFClient::UI::Button
1254 text => "set",
1255 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN;
1258 1;
1259 });
1260
1261 $table
1262}
1263
919sub make_inventory_window { 1264sub inventory_window {
920 my $invwin = new CFClient::UI::FancyFrame 1265 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1266 x => "center",
1267 y => "center",
921 def_w => $WIDTH * 7/8, 1268 force_w => $WIDTH * 9/10,
922 def_h => $HEIGHT * 7/8, 1269 force_h => $HEIGHT * 9/10,
923 title => "Inventory", 1270 title => "Inventory",
924 name => "inventory_window",
925 on_visibility_change => sub {
926 my ($self, $visible) = @_;
927 $self->center if $visible;
928 },
929 ; 1271 ;
930 1272
931 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1273 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932 1274
933 $hb->add (my $vb1 = new CFClient::UI::VBox); 1275 $hb->add (my $vb1 = new CFClient::UI::VBox);
934 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1276 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1277 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936 1278
937 $hb->add (my $vb2 = new CFClient::UI::VBox); 1279 $hb->add (my $vb2 = new CFClient::UI::VBox);
938 1280
1281 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1282
1283 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1284
1285 # XXX: Call after $INVR = ... because set_opencont sets the items
1286 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1287
1288 $invwin
1289}
1290
1291sub spell_setup {
1292 new CFClient::UI::SpellList
1293}
1294
1295sub keyboard_setup {
1296 my $binding_list = new CFClient::UI::VBox;
1297
1298 my $refresh;
1299 $refresh = sub {
1300 $binding_list->clear ();
1301
1302 for my $mod (keys %{$::CFG->{bindings}}) {
1303 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1304 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1305 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1306
1307 my $lbl = join "; ", @$cmds;
1308 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1309 $binding_list->add (my $hb = new CFClient::UI::HBox);
1310 $hb->add (new CFClient::UI::Button
1311 text => "delete",
1312 tooltip => "Deletes the binding",
1313 on_activate => sub {
1314 $binding_list->remove ($hb);
1315 delete $::CFG->{bindings}->{$mod}->{$sym};
1316 });
1317
1318 $hb->add (new CFClient::UI::Button
1319 text => "edit",
1320 tooltip => "Edits the binding",
1321 on_activate => sub {
1322 $::BIND_EDITOR->set_binding (
1323 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1324 sub {
1325 my ($nmod, $nsym, $ncmds) = @_;
1326 delete $::CFG->{bindings}->{$mod}->{$sym};
1327 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1328 $refresh->();
1329 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1330 $SETUP_DIALOG->show;
1331 },
1332 sub {
1333 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1334 $SETUP_DIALOG->show;
1335 });
1336 $::BIND_EDITOR->show;
1337 $SETUP_DIALOG->hide;
1338 });
1339
1340 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1341 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1342 }
1343 }
1344 };
1345
1346 my $vb = new CFClient::UI::VBox;
1347 $vb->add ($binding_list);
939 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1348 $vb->add (my $hb = new CFClient::UI::HBox);
940 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 1349
941 $hb2->add (new CFClient::UI::Button 1350 $hb->add (new CFClient::UI::Button
942 text => "Close", 1351 text => "record new",
943 tooltip => "Close the currently open container (if one is open)", 1352 expand => 1,
1353 tooltip => "This button opens the binding editor with an empty binding.",
944 on_activate => sub { 1354 on_activate => sub {
945 $CONN->send ("apply $CONN->{open_container}") 1355 $::BIND_EDITOR->set_binding (undef, undef, [],
946 if $CONN->{open_container} != 0; 1356 sub {
1357 my ($mod, $sym, $cmds) = @_;
1358 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1359 $refresh->();
1360 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1361 $SETUP_DIALOG->show;
1362 },
1363 sub {
1364 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1365 $SETUP_DIALOG->show;
1366 },
1367 );
1368 $SETUP_DIALOG->hide;
1369 $::BIND_EDITOR->show;
947 }, 1370 },
948 ); 1371 );
949 1372
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1373 $hb->add (new CFClient::UI::Button
1374 text => "close",
1375 tooltip => "Closes the binding window",
1376 expand => 1,
1377 on_activate => sub {
1378 $SETUP_DIALOG->hide;
1379 }
1380 );
951 1381
952 $invwin 1382 $refresh->();
953}
954 1383
1384 $vb
1385}
1386
955sub make_help_window { 1387sub help_window {
956 my $win = new CFClient::UI::FancyFrame 1388 my $win = new CFClient::UI::FancyFrame
1389 x => 'center',
1390 y => 'center',
1391 z => 2,
1392 name => 'doc_browser',
957 def_w => int $WIDTH * 7/8, 1393 force_w => int $WIDTH * 7/8,
958 def_h => int $HEIGHT * 7/8, 1394 force_h => int $HEIGHT * 7/8,
959 title => "Documentation"; 1395 title => "Documentation";
960 1396
961 $win->add (my $vbox = new CFClient::UI::VBox); 1397 $win->add (my $vbox = new CFClient::UI::VBox);
962 1398
963 $vbox->add (my $buttons = new CFClient::UI::HBox); 1399 $vbox->add (my $buttons = new CFClient::UI::HBox);
964 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1400 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1401 expand => 1, fontsize => 0.8, padding_x => 4);
965 1402
966 for ( 1403 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1404 $buttons->add (my $combo = new CFClient::UI::Combobox
1405 value => undef,
1406 options => [
967 [intro => "Introduction"], 1407 [intro => "Introduction"],
968 [manual => "Manual"], 1408 [manual => "Manual"],
1409 [skill_help => "Skills"],
969 [command_help => "Commands"], 1410 [command_help => "Commands"],
970 [skill_help => "Skills"], 1411 [dmcommand_help => "DM Commands"],
971 ) { 1412 [COPYING => "License Terms"],
972 my ($pod, $label) = @$_; 1413 ],
1414 on_changed => sub {
1415 my ($self, $pod) = @_;
973 1416
974 $buttons->add (new CFClient::UI::Button 1417 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
975 text => $label, 1418 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 1419
980 $viewer->clear; 1420 $viewer->clear;
981 1421
982 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1422 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983 for @{ CFClient::pod_to_pango_list $pom }; 1423 for @$pom;
984 1424
985 $viewer->set_offset (0); 1425 $viewer->set_offset (0);
986 }, 1426 },
1427 on_visibility_change => sub {
1428 my ($self, $visible) = @_;
1429 return unless $visible;
1430 return if $self->{value};
1431 $self->set_value ("intro");
1432 },
987 ); 1433 );
988 }
989
990 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
991 1434
992 $win 1435 $win
993} 1436}
994 1437
995sub sdl_init { 1438sub sdl_init {
… …
1025 if ($DEBUG_STATUS) { 1468 if ($DEBUG_STATUS) {
1026 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1469 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027 } else { 1470 } else {
1028 # create the widgets 1471 # create the widgets
1029 1472
1030 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1473 $DEBUG_STATUS = new CFClient::UI::Label
1474 padding => 0,
1475 z => 100,
1476 force_x => "max",
1477 force_y => 0;
1031 $DEBUG_STATUS->show; 1478 $DEBUG_STATUS->show;
1032 1479
1480 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1481
1033 $STATUSBOX = new CFClient::UI::Statusbox; 1482 $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]); 1483 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1035 1484
1036 (new CFClient::UI::Frame 1485 (new CFClient::UI::Frame
1037 bg => [0, 0, 0, 0.4], 1486 bg => [0, 0, 0, 0.4],
1038 req_y => -1, 1487 force_x => 0,
1488 force_y => "max",
1039 child => $STATUSBOX, 1489 child => $STATUSBOX,
1040 )->show; 1490 )->show;
1041 1491
1042 CFClient::UI::FancyFrame->new ( 1492 CFClient::UI::FancyFrame->new (
1493 title => "Map",
1494 name => "mapmap",
1495 x => 0,
1496 y => $FONTSIZE + 8,
1043 border_bg => [1, 1, 1, 192/255], 1497 border_bg => [1, 1, 1, 192/255],
1044 bg => [1, 1, 1, 0], 1498 bg => [1, 1, 1, 0],
1045 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1499 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.", 1500 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047 ), 1501 ),
… …
1061 } 1515 }
1062 }); 1516 });
1063 $MAPWIDGET->show; 1517 $MAPWIDGET->show;
1064 $MAPWIDGET->focus_in; 1518 $MAPWIDGET->focus_in;
1065 1519
1066 $LOGVIEW = new CFClient::UI::TextView 1520 $LOGVIEW = new CFClient::UI::TextScroller
1067 expand => 1, 1521 expand => 1,
1068 font => $FONT_FIXED, 1522 font => $FONT_FIXED,
1069 fontsize => $::CFG->{log_fontsize}, 1523 fontsize => $::CFG->{log_fontsize},
1524 indent => -4,
1070 can_hover => 1, 1525 can_hover => 1,
1071 can_events => 1, 1526 can_events => 1,
1072 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1527 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073 ; 1528 ;
1074 1529
1075 $BUTTONBAR = new CFClient::UI::HBox; 1530 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1531 title => "Setup",
1532 name => "setup_dialog",
1533 x => 'center',
1534 y => 'center',
1535 z => 2,
1536 force_w => $::WIDTH * 0.6,
1537 force_h => $::HEIGHT * 0.6,
1538 ;
1076 1539
1540 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1541 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1542
1543 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1544 "Configure the server to play on, your username, password and other server-related options.");
1545 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1546 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1547 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1548 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1549 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1550 "Configure the use of audio, sound effects and background music.");
1551 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1552 "Lets you define, edit and delete bindings."
1553 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1554 . "with nothing set and the recording started. After doing the actions you "
1555 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1556 . "After pressing the combo the binding will be saved automatically and the "
1557 . "binding editor closes");
1558 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1559 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1560 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1561 "Some debuggign options. Do not ask.");
1562
1563 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1564
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1565 $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."); 1566 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, 1567
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, 1568 $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."); 1569 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083 1570
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 1571 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 1572
1086 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1573 $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."); 1574 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, 1575 $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 :)."); 1576 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1577 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1090 1578
1091 $BUTTONBAR->add (new CFClient::UI::Button 1579 $BUTTONBAR->add (new CFClient::UI::Button
1092 text => "Save Config", 1580 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.", 1581 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 { 1582 on_activate => sub {
1095 $::CFG->{layout} = CFClient::UI::get_layout; 1583 $::CFG->{layout} = CFClient::UI::get_layout;
1096 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1584 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097 status "Configuration Saved"; 1585 status "Configuration Saved";
1098 }, 1586 },
1099 ); 1587 );
1100 1588
1101 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1589 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1102 tooltip => "View Documentation"); 1590 tooltip => "View Documentation");
1103 1591
1104 $BUTTONBAR->add (new CFClient::UI::Button 1592 $BUTTONBAR->add (new CFClient::UI::Button
1105 text => "Quit", 1593 text => "Quit",
1106 tooltip => "Terminates the program", 1594 tooltip => "Terminates the program",
… …
1112 } 1600 }
1113 }, 1601 },
1114 ); 1602 );
1115 1603
1116 $BUTTONBAR->show; 1604 $BUTTONBAR->show;
1117 1605 $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 } 1606 }
1607
1608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1122} 1609}
1123 1610
1124sub video_shutdown { 1611sub video_shutdown {
1125 undef $SDL_ACTIVE; 1612 undef $SDL_ACTIVE;
1126} 1613}
… …
1193 1680
1194my %demo;#d# 1681my %demo;#d#
1195 1682
1196sub force_refresh { 1683sub force_refresh {
1197 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1684 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1198 debug sprintf "%3.2f", $fps; 1685 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1199 1686
1200 $CFClient::UI::ROOT->draw; 1687 $CFClient::UI::ROOT->draw;
1201 1688
1202 $WANT_REFRESH = 0; 1689 $WANT_REFRESH = 0;
1203 $CAN_REFRESH = 0; 1690 $CAN_REFRESH = 0;
… …
1258}; 1745};
1259 1746
1260 CFClient::SDL_GL_SwapBuffers; 1747 CFClient::SDL_GL_SwapBuffers;
1261} 1748}
1262 1749
1263my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1750my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1264 $NOW = time; 1751 $NOW = time;
1265 1752
1266 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1753 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1267 for CFClient::SDL_PollEvent; 1754 for CFClient::SDL_PollEvent;
1268 1755
… …
1335############################################################################# 1822#############################################################################
1336 1823
1337$SIG{INT} = $SIG{TERM} = sub { exit }; 1824$SIG{INT} = $SIG{TERM} = sub { exit };
1338 1825
1339{ 1826{
1340 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1827 local $SIG{__DIE__} = sub {
1828 return unless defined $^S && !$^S;
1829 Carp::confess $_[1];#d#TODO: remove when stable
1830 CFClient::fatal $_[0];
1831 };
1341 1832
1342 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1833 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1343 CFClient::UI::set_layout ($::CFG->{layout}); 1834 CFClient::UI::set_layout ($::CFG->{layout});
1344 1835
1345 my %DEF_CFG = ( 1836 my %DEF_CFG = (
1346 sdl_mode => 0, 1837 sdl_mode => 0,
1347 width => 640, 1838 width => 640,
… …
1351 map_scale => 1, 1842 map_scale => 1,
1352 fow_enable => 1, 1843 fow_enable => 1,
1353 fow_intensity => 0.45, 1844 fow_intensity => 0.45,
1354 fow_smooth => 0, 1845 fow_smooth => 0,
1355 gui_fontsize => 1, 1846 gui_fontsize => 1,
1356 log_fontsize => 1, 1847 log_fontsize => 0.7,
1357 gauge_fontsize=> 1, 1848 gauge_fontsize=> 1,
1358 gauge_size => 0.35, 1849 gauge_size => 0.35,
1359 stat_fontsize => 1, 1850 stat_fontsize => 0.7,
1360 mapsize => 100, 1851 mapsize => 100,
1361 host => "crossfire.schmorp.de", 1852 host => "crossfire.schmorp.de",
1362 say_command => 'say', 1853 say_command => 'say',
1363 audio_enable => 1, 1854 audio_enable => 1,
1364 bgm_enable => 1, 1855 bgm_enable => 1,
1365 bgm_volume => 0.25, 1856 bgm_volume => 0.25,
1366 face_prefetch => 0, 1857 face_prefetch => 0,
1367 output_sync => 1, 1858 output_sync => 1,
1368 output_count => 1, 1859 output_count => 1,
1860 pickup => 0,
1369 ); 1861 );
1370 1862
1371 while (my ($k, $v) = each %DEF_CFG) { 1863 while (my ($k, $v) = each %DEF_CFG) {
1372 $CFG->{$k} = $v unless exists $CFG->{$k}; 1864 $CFG->{$k} = $v unless exists $CFG->{$k};
1373 } 1865 }
… …
1425 1917
1426END { CFClient::SDL_Quit } 1918END { CFClient::SDL_Quit }
1427 1919
1428=head1 NAME 1920=head1 NAME
1429 1921
1430pclient - A Crossfire+ and Crossfire game client 1922cfplus - A Crossfire+ and Crossfire game client
1431 1923
1432=head1 SYNOPSIS 1924=head1 SYNOPSIS
1433 1925
1434Just run it - no commandline arguments are supported. 1926Just run it - no commandline arguments are supported.
1435 1927
1436=head1 USAGE 1928=head1 USAGE
1437 1929
1438Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1930cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1439fullscreen and interactively. 1931fullscreen and interactively.
1440 1932
1933=head1 DEBUGGING
1934
1935
1936CFPLUS_DEBUG - environment variable
1937
1938 1 draw borders around widgets
1939 2 add low-level widget info to tooltips
1940 4 show fps
1941 8 suppress tooltips
1942
1441=head1 AUTHOR 1943=head1 AUTHOR
1442 1944
1443Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1945Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1444 1946
1445 1947

Diff Legend

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