ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.71 by elmex, Tue Jun 13 14:35:18 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;
89our $SERVER_INFO;
86 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
87our $FLOORBOX; 99our $FLOORBOX;
88our $GAUGES; 100our $GAUGES;
89our $STATWIDS; 101our $STATWIDS;
90 102
91our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
97 109
98our $ALT_ENTER_MESSAGE; 110our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 111our $STATUSBOX;
100our $DEBUG_STATUS; 112our $DEBUG_STATUS;
101 113
114our $INV_WINDOW;
102our $INV; 115our $INV;
103our $INVR; 116our $INVR;
104our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
105 122
106sub status { 123sub status {
107 $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]);
108} 125}
109 126
110sub debug { 127sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
113 $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;
114} 310}
115 311
116sub start_game { 312sub start_game {
117 status "logging in..."; 313 status "logging in...";
314
315 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide;
118 317
119 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;
120 319
121 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
122 321
… …
134 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 334 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
137 map => $MAP, 336 map => $MAP,
138 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
139 339
140 sound_play => sub { 340 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
142 342
143 $SDL_MIXER 343 $SDL_MIXER
… …
151 }; 351 };
152 352
153 if ($CONN) { 353 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 354 CFClient::lowdelay fileno $CONN->{fh};
155 355
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 356 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 357 } else {
163 status "unable to connect"; 358 status "unable to connect";
164 stop_game(); 359 stop_game();
165 } 360 }
166} 361}
167 362
168sub stop_game { 363sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
369
169 return unless $CONN; 370 return unless $CONN;
170 371
171 status "connection closed"; 372 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 373
374 destroy_query_dialog $CONN;
173 $CONN->destroy; 375 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 377}
179 378
180sub client_setup { 379sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 name => "client_setup",
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
381
185 $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]);
186 383
187 $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");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 386
190 $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]);
191 $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");
192 389
193 $mode_slider->connect (changed => sub { 390 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 391 my ($self, $value) = @_;
195 392
… …
312 on_activate => sub { 509 on_activate => sub {
313 video_shutdown (); 510 video_shutdown ();
314 video_init (); 511 video_init ();
315 } 512 }
316 ); 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;
317 524
318 $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");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
321 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
… …
352 audio_shutdown (); 559 audio_shutdown ();
353 audio_init (); 560 audio_init ();
354 } 561 }
355 ); 562 );
356 563
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 on_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370} 565}
371 566
372sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 578
384sub make_gauge_window { 579sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 580 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 581
387 my $win = new CFClient::UI::Frame ( 582 my $win = new CFClient::UI::Frame (
388 req_y => -1, 583 force_x => 0,
584 force_y => "max",
389 user_w => $WIDTH, 585 force_w => $WIDTH,
390 user_h => $gh, 586 force_h => $gh,
391 ); 587 );
392 588
393 $win->add (my $hbox = new CFClient::UI::HBox 589 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 590 children => [
395 (new CFClient::UI::HBox expand => 1), 591 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
432 628
433 $win 629 $win
434} 630}
435 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
436sub make_stats_window { 660sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 661 my $tgw = new CFClient::UI::FancyFrame
662 y => $HEIGHT * (2/8),
663 x => "max",
664 title => "Stats",
665 name => "stats_window";
438 666
439 $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);
440 $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,
441 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
541 update_stats_window ({}); 769 update_stats_window ({});
542 770
543 $tgw 771 $tgw
544} 772}
545 773
546sub formsep { 774sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 776}
549 777
550sub update_stats_window { 778sub update_stats_window {
551 my ($stats) = @_; 779 my ($stats) = @_;
552 780
… …
614 842
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 844 for keys %tbl;
617} 845}
618 846
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627}
628
629my $METASERVER_ATIME; 847my $METASERVER_ATIME;
630 848
631sub update_metaserver { 849sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
636 852
637 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
638 $table->clear; 854 $table->clear;
… …
659 875
660 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
661 877
662 $table->clear; 878 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 892 for 0 .. $#col;
667 893
668 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
669 895
670 my $y = 0; 896 my $y = 0;
671 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) {
… …
688 914
689 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
690 916
691 $y++; 917 $y++;
692 918
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
925 $METASERVER->hide;
926 },
696 }), 927 ),
697 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
698 ]); 929 ]);
699 930
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
701 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)
702 for 0 .. $#$m; 939 for 0 .. $#$m;
703 } 940 }
704 } 941 }
705 }); 942 });
706} 943}
707 944
945sub metaserver_dialog {
946 my $dialog = new CFClient::UI::FancyFrame
947 title => "Server List",
948 name => 'metaserver_dialog',
949 x => 'center',
950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
953 child => (my $vbox = new CFClient::UI::VBox),
954 on_visibility_change => sub {
955 update_metaserver if $_[1];
956 },
957 ;
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
708sub server_setup { 966sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 name => "server_setup",
711 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 967 my $vbox = new CFClient::UI::VBox;
713 968
714 $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]);
715 $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");
716 971
717 { 972 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 974
720 $vbox->add ( 975 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 976 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 977 expand => 1,
723 text => $CFG->{host}, 978 text => $CFG->{host},
724 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",
725 on_changed => sub { 980 on_changed => sub {
726 my ($self, $value) = @_; 981 my ($self, $value) = @_;
… …
728 } 983 }
729 ); 984 );
730 985
731 $METASERVER = metaserver_dialog; 986 $METASERVER = metaserver_dialog;
732 987
733 $vbox->add (new CFClient::UI::Flopper 988 $vbox->add (new CFClient::UI::Button
734 expand => 1, 989 expand => 1,
735 text => "Server List", 990 text => "Server List",
736 other => $METASERVER, 991 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
738 on_open => sub { 993 on_activate => sub { $METASERVER->toggle_visibility },
739 update_metaserver $HOST; 994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
740 }
741 ); 995 );
742 } 996 }
743 997
744 $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");
745 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
762 } 1016 }
763 ); 1017 );
764 1018
765 $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");
766 $table->add (1, 7, new CFClient::UI::Slider 1020 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 1021 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1022 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 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. "
770 . "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, "
771 . "but you also increase bandwidth requirements and latency. " 1025 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 1026 . "This option is only used once at log-in.",
… …
812 $CONN ? stop_game 1066 $CONN ? stop_game
813 : start_game; 1067 : start_game;
814 }, 1068 },
815 ); 1069 );
816 1070
817 $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
818} 1093}
819 1094
820sub message_window { 1095sub message_window {
821 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 1097 name => "message_window",
823 title => "Messages", 1098 title => "Messages",
824 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
826 user_w => int $::WIDTH / 3, 1101 x => "max",
1102 y => 0,
1103 force_w => $::WIDTH * 0.4,
827 user_h => int $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
828 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
829 1106
830 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
831 1108
832 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
864 }, 1141 },
865 ); 1142 );
866 1143
867 $CONSOLE = { 1144 $CONSOLE = {
868 window => $window, 1145 window => $window,
869 input => $input 1146 input => $input,
870 }; 1147 };
871 1148
872 $window 1149 $window
873} 1150}
874 1151
875sub open_quit_dialog { 1152sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
877
878 $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 ;
879 1160
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 1162
882 $vb->add (new CFClient::UI::Label 1163 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 1164 text => "You should find a savebed and apply it first!",
… …
893 $hb->add (new CFClient::UI::Button 1174 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 1175 text => "Quit anyway",
895 expand => 1, 1176 expand => 1,
896 on_activate => sub { exit }, 1177 on_activate => sub { exit },
897 ); 1178 );
898
899 $QUIT_DIALOG->show_centered;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 } 1179 }
903}
904 1180
905sub make_inventory_window { 1181 $QUIT_DIALOG->show;
906 my $invwin = new CFClient::UI::FancyFrame 1182}
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";
908 1183
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1184sub autopickup_setup {
1185 my $table = new CFClient::UI::Table;
910 1186
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1187 for (
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1188 ["General", 0, 0,
913 $lbl->set_text ("Player"); 1189 ["Enable autopickup" => PICKUP_NEWMODE],
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 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 ],
915 1208
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 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]);
917 1230
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1231 for (@bits) {
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 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 });
920 $hb2->add (new CFClient::UI::Button 1264 $table->add (3, 18, new CFClient::UI::Button
921 text => "Close", 1265 text => "set",
922 tooltip => "Close the currently open container (if one is open)",
923 on_activate => sub { 1266 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}") 1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
925 if $CONN->{open_container} != 0; 1268 if defined $::CONN;
1269 1;
1270 });
1271
1272 $table
1273}
1274
1275sub inventory_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center",
1278 y => "center",
1279 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10,
1281 title => "Inventory",
1282 ;
1283
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1285
1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1289
1290 $hb->add (my $vb2 = new CFClient::UI::VBox);
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 (my $hb = new CFClient::UI::HBox);
1359 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1360 $hb->add (new CFClient::UI::CheckBox
1361 expand => 1,
1362 state => $CFG->{shift_fire_stop},
1363 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1364 on_changed => sub {
1365 my ($cbox, $value) = @_;
1366 $CFG->{shift_fire_stop} = $value;
1367 });
1368
1369 $vb->add ($binding_list);
1370 $vb->add (my $hb = new CFClient::UI::HBox);
1371
1372 $hb->add (new CFClient::UI::Button
1373 text => "record new",
1374 expand => 1,
1375 tooltip => "This button opens the binding editor with an empty binding.",
1376 on_activate => sub {
1377 $::BIND_EDITOR->set_binding (undef, undef, [],
1378 sub {
1379 my ($mod, $sym, $cmds) = @_;
1380 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1381 $refresh->();
1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1383 $SETUP_DIALOG->show;
1384 },
1385 sub {
1386 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1387 $SETUP_DIALOG->show;
1388 },
1389 );
1390 $SETUP_DIALOG->hide;
1391 $::BIND_EDITOR->show;
926 }, 1392 },
927 ); 1393 );
928 1394
929 $INVR_LBL->set_text ("Floor"); 1395 $hb->add (new CFClient::UI::Button
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1396 text => "close",
1397 tooltip => "Closes the binding window",
1398 expand => 1,
1399 on_activate => sub {
1400 $SETUP_DIALOG->hide;
1401 }
1402 );
931 1403
932 $invwin 1404 $refresh->();
933}
934 1405
1406 $vb
1407}
1408
935sub make_help_window { 1409sub help_window {
936 my $win = new CFClient::UI::FancyFrame 1410 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1411 x => 'center',
1412 y => 'center',
1413 z => 2,
1414 name => 'doc_browser',
1415 force_w => int $WIDTH * 7/8,
1416 force_h => int $HEIGHT * 7/8,
1417 title => "Documentation";
938 1418
939 $win->add (my $vbox = new CFClient::UI::VBox); 1419 $win->add (my $vbox = new CFClient::UI::VBox);
940 1420
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1421 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1422 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1423 expand => 1, fontsize => 0.8, padding_x => 4);
943 1424
944 for ( 1425 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1426 $buttons->add (my $combo = new CFClient::UI::Combobox
1427 value => undef,
1428 options => [
945 [intro => "Introduction"], 1429 [intro => "Introduction"],
946 [manual => "Manual"], 1430 [manual => "Manual"],
1431 [skill_help => "Skills"],
947 [command_help => "Commands"], 1432 [command_help => "Commands"],
948 [skill_help => "Skills"], 1433 [dmcommand_help => "DM Commands"],
949 ) { 1434 [COPYING => "License Terms"],
950 my ($pod, $label) = @$_; 1435 ],
1436 on_changed => sub {
1437 my ($self, $pod) = @_;
951 1438
952 $buttons->add (new CFClient::UI::Button 1439 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
953 text => $label, 1440 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
954 on_activate => sub {
955 my $parser = new Pod::POM;
956 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
957 1441
958 $viewer->clear; 1442 $viewer->clear;
959 1443
960 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1444 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
961 for @{ CFClient::pod_to_pango_list $pom }; 1445 for @$pom;
962 1446
963 $viewer->set_offset (0); 1447 $viewer->set_offset (0);
964 }, 1448 },
1449 on_visibility_change => sub {
1450 my ($self, $visible) = @_;
1451 return unless $visible;
1452 return if $self->{value};
1453 $self->set_value ("intro");
1454 },
965 ); 1455 );
966 }
967
968 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
969 1456
970 $win 1457 $win
971} 1458}
972 1459
973sub sdl_init { 1460sub sdl_init {
… …
1003 if ($DEBUG_STATUS) { 1490 if ($DEBUG_STATUS) {
1004 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1491 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005 } else { 1492 } else {
1006 # create the widgets 1493 # create the widgets
1007 1494
1008 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1495 $DEBUG_STATUS = new CFClient::UI::Label
1496 padding => 0,
1497 z => 100,
1498 force_x => "max",
1499 force_y => 0;
1009 $DEBUG_STATUS->show; 1500 $DEBUG_STATUS->show;
1010 1501
1502 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1503
1011 $STATUSBOX = new CFClient::UI::Statusbox; 1504 $STATUSBOX = new CFClient::UI::Statusbox;
1012 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1505 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1013 1506
1014 (new CFClient::UI::Frame 1507 (new CFClient::UI::Frame
1015 bg => [0, 0, 0, 0.4], 1508 bg => [0, 0, 0, 0.4],
1016 req_y => -1, 1509 force_x => 0,
1510 force_y => "max",
1017 child => $STATUSBOX, 1511 child => $STATUSBOX,
1018 )->show; 1512 )->show;
1019 1513
1020 CFClient::UI::FancyFrame->new ( 1514 CFClient::UI::FancyFrame->new (
1515 title => "Map",
1516 name => "mapmap",
1517 x => 0,
1518 y => $FONTSIZE + 8,
1021 border_bg => [1, 1, 1, 192/255], 1519 border_bg => [1, 1, 1, 192/255],
1022 bg => [1, 1, 1, 0], 1520 bg => [1, 1, 1, 0],
1521 no_close_button => 1,
1023 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1522 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1523 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025 ), 1524 ),
1026 )->show; 1525 )->show;
1027 1526
… …
1039 } 1538 }
1040 }); 1539 });
1041 $MAPWIDGET->show; 1540 $MAPWIDGET->show;
1042 $MAPWIDGET->focus_in; 1541 $MAPWIDGET->focus_in;
1043 1542
1044 $LOGVIEW = new CFClient::UI::TextView 1543 $LOGVIEW = new CFClient::UI::TextScroller
1045 expand => 1, 1544 expand => 1,
1046 font => $FONT_FIXED, 1545 font => $FONT_FIXED,
1047 fontsize => $::CFG->{log_fontsize}, 1546 fontsize => $::CFG->{log_fontsize},
1547 indent => -4,
1048 can_hover => 1, 1548 can_hover => 1,
1049 can_events => 1, 1549 can_events => 1,
1050 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1550 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051 ; 1551 ;
1052 1552
1053 $BUTTONBAR = new CFClient::UI::HBox; 1553 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1554 title => "Setup",
1555 name => "setup_dialog",
1556 x => 'center',
1557 y => 'center',
1558 z => 2,
1559 force_w => $::WIDTH * 0.6,
1560 force_h => $::HEIGHT * 0.6,
1561 ;
1054 1562
1563 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1564 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1565
1566 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1567 "Configure the server to play on, your username, password and other server-related options.");
1568 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1569 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1570 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1571 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1572 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1573 "Configure the use of audio, sound effects and background music.");
1574 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1575 "Lets you define, edit and delete bindings."
1576 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1577 . "with nothing set and the recording started. After doing the actions you "
1578 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1579 . "After pressing the combo the binding will be saved automatically and the "
1580 . "binding editor closes");
1581 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1582 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1583 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1584 "Some debuggign options. Do not ask.");
1585
1586 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1587
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1588 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1056 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1589 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1057 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1590
1058 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1059 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1591 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1060 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1592 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1061 1593
1062 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1594 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1063 1595
1064 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1065 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1597 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1067 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1599 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1600 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1068 1601
1069 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1603 text => "Save Config",
1071 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1604 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072 on_activate => sub { 1605 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1606 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1607 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075 status "Configuration Saved"; 1608 status "Configuration Saved";
1076 }, 1609 },
1077 ); 1610 );
1078 1611
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1612 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1080 tooltip => "View Documentation"); 1613 tooltip => "View Documentation");
1081 1614
1082 $BUTTONBAR->add (new CFClient::UI::Button 1615 $BUTTONBAR->add (new CFClient::UI::Button
1083 text => "Quit", 1616 text => "Quit",
1084 tooltip => "Terminates the program", 1617 tooltip => "Terminates the program",
… …
1090 } 1623 }
1091 }, 1624 },
1092 ); 1625 );
1093 1626
1094 $BUTTONBAR->show; 1627 $BUTTONBAR->show;
1095 1628 $SETUP_DIALOG->show;
1096 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098 # delay till geometry is constant
1099 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101 my $widget = $GAUGES->{win};
1102 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103 });
1104 force_refresh ();
1105 } 1629 }
1630
1631 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1106} 1632}
1107 1633
1108sub video_shutdown { 1634sub video_shutdown {
1109 undef $SDL_ACTIVE; 1635 undef $SDL_ACTIVE;
1110} 1636}
… …
1177 1703
1178my %demo;#d# 1704my %demo;#d#
1179 1705
1180sub force_refresh { 1706sub force_refresh {
1181 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1707 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1182 debug sprintf "%3.2f", $fps; 1708 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183 1709
1184 $CFClient::UI::ROOT->draw; 1710 $CFClient::UI::ROOT->draw;
1185 1711
1186 $WANT_REFRESH = 0; 1712 $WANT_REFRESH = 0;
1187 $CAN_REFRESH = 0; 1713 $CAN_REFRESH = 0;
… …
1242}; 1768};
1243 1769
1244 CFClient::SDL_GL_SwapBuffers; 1770 CFClient::SDL_GL_SwapBuffers;
1245} 1771}
1246 1772
1247my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1773my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1248 $NOW = time; 1774 $NOW = time;
1249 1775
1250 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1776 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1251 for CFClient::SDL_PollEvent; 1777 for CFClient::SDL_PollEvent;
1252 1778
… …
1319############################################################################# 1845#############################################################################
1320 1846
1321$SIG{INT} = $SIG{TERM} = sub { exit }; 1847$SIG{INT} = $SIG{TERM} = sub { exit };
1322 1848
1323{ 1849{
1324 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1850 local $SIG{__DIE__} = sub {
1851 return unless defined $^S && !$^S;
1852 Carp::confess $_[1];#d#TODO: remove when stable
1853 CFClient::fatal $_[0];
1854 };
1325 1855
1326 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1856 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327 CFClient::UI::set_layout ($::CFG->{layout}); 1857 CFClient::UI::set_layout ($::CFG->{layout});
1328 1858
1329 my %DEF_CFG = ( 1859 my %DEF_CFG = (
1330 sdl_mode => 0, 1860 sdl_mode => 0,
1331 width => 640, 1861 width => 640,
… …
1335 map_scale => 1, 1865 map_scale => 1,
1336 fow_enable => 1, 1866 fow_enable => 1,
1337 fow_intensity => 0.45, 1867 fow_intensity => 0.45,
1338 fow_smooth => 0, 1868 fow_smooth => 0,
1339 gui_fontsize => 1, 1869 gui_fontsize => 1,
1340 log_fontsize => 1, 1870 log_fontsize => 0.7,
1341 gauge_fontsize=> 1, 1871 gauge_fontsize=> 1,
1342 gauge_size => 0.35, 1872 gauge_size => 0.35,
1343 stat_fontsize => 1, 1873 stat_fontsize => 0.7,
1344 mapsize => 100, 1874 mapsize => 100,
1345 host => "crossfire.schmorp.de", 1875 host => "crossfire.schmorp.de",
1346 say_command => 'say', 1876 say_command => 'say',
1347 audio_enable => 1, 1877 audio_enable => 1,
1348 bgm_enable => 1, 1878 bgm_enable => 1,
1349 bgm_volume => 0.25, 1879 bgm_volume => 0.25,
1350 face_prefetch => 0, 1880 face_prefetch => 0,
1351 output_sync => 1, 1881 output_sync => 1,
1352 output_count => 1, 1882 output_count => 1,
1883 pickup => 0,
1353 ); 1884 );
1354 1885
1355 while (my ($k, $v) = each %DEF_CFG) { 1886 while (my ($k, $v) = each %DEF_CFG) {
1356 $CFG->{$k} = $v unless exists $CFG->{$k}; 1887 $CFG->{$k} = $v unless exists $CFG->{$k};
1357 } 1888 }
… …
1404 video_init; 1935 video_init;
1405 audio_init; 1936 audio_init;
1406} 1937}
1407 1938
1408Event::loop; 1939Event::loop;
1940#CFClient::SDL_Quit;
1941#CFClient::_exit 0;
1409 1942
1410END { CFClient::SDL_Quit } 1943END { CFClient::SDL_Quit }
1411 1944
1412=head1 NAME 1945=head1 NAME
1413 1946
1414pclient - A Crossfire+ and Crossfire game client 1947cfplus - A Crossfire+ and Crossfire game client
1415 1948
1416=head1 SYNOPSIS 1949=head1 SYNOPSIS
1417 1950
1418Just run it - no commandline arguments are supported. 1951Just run it - no commandline arguments are supported.
1419 1952
1420=head1 USAGE 1953=head1 USAGE
1421 1954
1422Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1955cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423fullscreen and interactively. 1956fullscreen and interactively.
1424 1957
1958=head1 DEBUGGING
1959
1960
1961CFPLUS_DEBUG - environment variable
1962
1963 1 draw borders around widgets
1964 2 add low-level widget info to tooltips
1965 4 show fps
1966 8 suppress tooltips
1967
1425=head1 AUTHOR 1968=head1 AUTHOR
1426 1969
1427Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1970Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1428 1971
1429 1972

Diff Legend

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