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.27 by elmex, Mon May 29 20:22:33 2006 UTC vs.
Revision 1.68 by elmex, Mon Jun 12 12:28:06 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
89our $SERVER_INFO;
87 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
88our $FLOORBOX; 99our $FLOORBOX;
89our $GAUGES; 100our $GAUGES;
90our $STATWIDS; 101our $STATWIDS;
91 102
92our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
103our $INV_WINDOW; 114our $INV_WINDOW;
104our $INV; 115our $INV;
105our $INVR; 116our $INVR;
106our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
107 118
108our $BIND_WINDOW; 119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
109 122
110sub status { 123sub status {
111 $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]);
112} 125}
113 126
114sub debug { 127sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
117 $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;
118} 310}
119 311
120sub start_game { 312sub start_game {
121 status "logging in..."; 313 status "logging in...";
122 314
123 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
125 317
126 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;
127 319
128 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
129 321
… …
141 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
142 logview => $LOGVIEW, 334 logview => $LOGVIEW,
143 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
144 map => $MAP, 336 map => $MAP,
145 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
146 339
147 sound_play => sub { 340 sound_play => sub {
148 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
149 342
150 $SDL_MIXER 343 $SDL_MIXER
… …
167 } 360 }
168} 361}
169 362
170sub stop_game { 363sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
174 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
175 369
176 return unless $CONN; 370 return unless $CONN;
177 371
178 status "connection closed"; 372 status "connection closed";
179 373
374 destroy_query_dialog $CONN;
180 $CONN->destroy; 375 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
182} 377}
183 378
184sub client_setup { 379sub graphics_setup {
185 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1,
187 req_y => $HEIGHT * (1/8),
188 name => "client_setup",
189 title => "Client Setup",
190 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
381
191 $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]);
192 383
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195 386
196 $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]);
197 $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");
198 389
199 $mode_slider->connect (changed => sub { 390 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 391 my ($self, $value) = @_;
201 392
… …
318 on_activate => sub { 509 on_activate => sub {
319 video_shutdown (); 510 video_shutdown ();
320 video_init (); 511 video_init ();
321 } 512 }
322 ); 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;
323 524
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
327 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.",
… …
358 audio_shutdown (); 559 audio_shutdown ();
359 audio_init (); 560 audio_init ();
360 } 561 }
361 ); 562 );
362 563
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 565}
377 566
378sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
389 578
390sub make_gauge_window { 579sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 580 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 581
393 my $win = new CFClient::UI::Frame ( 582 my $win = new CFClient::UI::Frame (
394 req_x => 0, 583 force_x => 0,
395 req_y => -1, 584 force_y => "max",
396 def_w => $WIDTH, 585 force_w => $WIDTH,
397 def_h => $gh, 586 force_h => $gh,
398 ); 587 );
399 588
400 $win->add (my $hbox = new CFClient::UI::HBox 589 $win->add (my $hbox = new CFClient::UI::HBox
401 children => [ 590 children => [
402 (new CFClient::UI::HBox expand => 1), 591 (new CFClient::UI::HBox expand => 1),
… …
438 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
439 628
440 $win 629 $win
441} 630}
442 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
443 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
444sub make_stats_window { 660sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
447 req_x => -1, 663 x => "max",
448 title => "Stats", 664 title => "Stats",
449 name => "stats_window"; 665 name => "stats_window";
450 666
451 $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);
452 $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,
453 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
454 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.");
… …
553 update_stats_window ({}); 769 update_stats_window ({});
554 770
555 $tgw 771 $tgw
556} 772}
557 773
558sub formsep { 774sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 776}
561 777
562sub update_stats_window { 778sub update_stats_window {
563 my ($stats) = @_; 779 my ($stats) = @_;
564 780
… …
626 842
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 843 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 844 for keys %tbl;
629} 845}
630 846
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 847my $METASERVER_ATIME;
642 848
643sub update_metaserver { 849sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
648 852
649 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
650 $table->clear; 854 $table->clear;
… …
671 875
672 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
673 877
674 $table->clear; 878 $table->clear;
675 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 );
676 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
677 $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[$_])
678 for 0 .. $#col; 892 for 0 .. $#col;
679 893
680 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
681 895
682 my $y = 0; 896 my $y = 0;
683 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) {
… …
700 914
701 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
702 916
703 $y++; 917 $y++;
704 918
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
706 (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 {
707 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
925 $METASERVER->hide;
926 },
708 }), 927 ),
709 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
710 ]); 929 ]);
711 930
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
713 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)
714 for 0 .. $#$m; 939 for 0 .. $#$m;
715 } 940 }
716 } 941 }
717 }); 942 });
718} 943}
719 944
720sub server_setup { 945sub metaserver_dialog {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
722 x => $WIDTH * (1/3), 947 title => "Server List",
723 y => $HEIGHT * (1/8), 948 name => 'metaserver_dialog',
724 name => "server_setup", 949 x => 'center',
725 title => "Server Setup", 950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
726 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub { 954 on_visibility_change => sub {
728 my ($self, $visible) = @_; 955 update_metaserver if $_[1];
729 $self->center if $visible;
730 }, 956 },
731 ; 957 ;
732 958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog
964}
965
966sub server_setup {
967 my $vbox = new CFClient::UI::VBox;
968
733 $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]);
734 $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");
735 971
736 { 972 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738 974
739 $vbox->add ( 975 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 976 $HOST_ENTRY = new CFClient::UI::Entry
741 expand => 1, 977 expand => 1,
742 text => $CFG->{host}, 978 text => $CFG->{host},
743 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",
744 on_changed => sub { 980 on_changed => sub {
745 my ($self, $value) = @_; 981 my ($self, $value) = @_;
… …
747 } 983 }
748 ); 984 );
749 985
750 $METASERVER = metaserver_dialog; 986 $METASERVER = metaserver_dialog;
751 987
752 $vbox->add (new CFClient::UI::Flopper 988 $vbox->add (new CFClient::UI::Button
753 expand => 1, 989 expand => 1,
754 text => "Server List", 990 text => "Server List",
755 other => $METASERVER, 991 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 993 on_activate => sub { $METASERVER->toggle_visibility },
758 update_metaserver $HOST; 994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
759 }
760 ); 995 );
761 } 996 }
762 997
763 $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");
764 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
781 } 1016 }
782 ); 1017 );
783 1018
784 $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");
785 $table->add (1, 7, new CFClient::UI::Slider 1020 $table->add (1, 7, new CFClient::UI::Slider
786 req_w => 100, 1021 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1022 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 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. "
789 . "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, "
790 . "but you also increase bandwidth requirements and latency. " 1025 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 1026 . "This option is only used once at log-in.",
… …
831 $CONN ? stop_game 1066 $CONN ? stop_game
832 : start_game; 1067 : start_game;
833 }, 1068 },
834 ); 1069 );
835 1070
836 $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
837} 1093}
838 1094
839sub message_window { 1095sub message_window {
840 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
841 name => "message_window", 1097 name => "message_window",
842 title => "Messages", 1098 title => "Messages",
843 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
845 req_x => -1, 1101 x => "max",
846 req_y => 0, 1102 y => 0,
847 def_w => int $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
848 def_h => int $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
849 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
850 1106
851 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
852 1108
853 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
867 }, 1123 },
868 on_activate => sub { 1124 on_activate => sub {
869 my ($input, $text) = @_; 1125 my ($input, $text) = @_;
870 $input->set_text (''); 1126 $input->set_text ('');
871 1127
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 1128 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 1129 $::CONN->user_send ($1);
876 } else { 1130 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 1131 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 1132 $::CONN->user_send ("$say_cmd $text");
879 } 1133 }
… …
887 }, 1141 },
888 ); 1142 );
889 1143
890 $CONSOLE = { 1144 $CONSOLE = {
891 window => $window, 1145 window => $window,
892 input => $input 1146 input => $input,
893 }; 1147 };
894 1148
895 $window 1149 $window
896} 1150}
897 1151
898sub open_quit_dialog { 1152sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
900 $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 ;
901 1160
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903 1162
904 $vb->add (new CFClient::UI::Label 1163 $vb->add (new CFClient::UI::Label
905 text => "You should find a savebed and apply it first!", 1164 text => "You should find a savebed and apply it first!",
… …
918 on_activate => sub { exit }, 1177 on_activate => sub { exit },
919 ); 1178 );
920 } 1179 }
921 1180
922 $QUIT_DIALOG->show; 1181 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center;
924} 1182}
925 1183
1184sub autopickup_setup {
1185 my $table = new CFClient::UI::Table;
1186
1187 for (
1188 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG],
1193 ],
1194 ["Weapons", 0, 6,
1195 ["All weapons" => PICKUP_ALLWEAPON],
1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1197 ["Bows" => PICKUP_BOW],
1198 ["Arrows" => PICKUP_ARROW],
1199 ],
1200 ["Armour", 0, 12,
1201 ["Helmets" => PICKUP_HELMET],
1202 ["Shields" => PICKUP_SHIELD],
1203 ["Body Armour" => PICKUP_ARMOUR],
1204 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK],
1207 ],
1208
1209 ["Readables", 2, 2,
1210 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ],
1214 ["Misc", 2, 7,
1215 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
1226 )
1227 {
1228 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230
1231 for (@bits) {
1232 ++$y;
1233
1234 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask,
1238 on_changed => sub {
1239 my ($box, $value) = @_;
1240
1241 if ($value) {
1242 $::CFG->{pickup} |= $mask;
1243 } else {
1244 $::CFG->{pickup} &= ~$mask;
1245 }
1246
1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN;
1249 });
1250 }
1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 1;
1270 });
1271
1272 $table
1273}
1274
926sub make_inventory_window { 1275sub inventory_window {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center",
1278 y => "center",
928 def_w => $WIDTH * 7/8, 1279 force_w => $WIDTH * 9/10,
929 def_h => $HEIGHT * 7/8, 1280 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1281 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ; 1282 ;
937 1283
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1285
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1298
953 $invwin 1299 $invwin
954} 1300}
955 1301
956sub make_binding_window { 1302sub spell_setup {
1303 new CFClient::UI::SpellList
1304}
1305
1306sub keyboard_setup {
957 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
958 1308
1309 my $refresh;
959 my $refresh = sub { 1310 $refresh = sub {
960 $binding_list->clear (); 1311 $binding_list->clear ();
961 1312
962 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966 1317
967 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
971 text => "delete", 1322 text => "delete",
1323 tooltip => "Deletes the binding",
972 on_activate => sub { 1324 on_activate => sub {
973 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
974 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{bindings}->{$mod}->{$sym};
975 }); 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
976 $hb->add (new CFClient::UI::Label text => "($nam)"); 1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
977 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978 } 1353 }
979 } 1354 }
980 }; 1355 };
981 1356
1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add ($binding_list);
1359 $vb->add (my $hb = new CFClient::UI::HBox);
1360
1361 $hb->add (new CFClient::UI::Button
1362 text => "record new",
1363 expand => 1,
1364 tooltip => "This button opens the binding editor with an empty binding.",
1365 on_activate => sub {
1366 $::BIND_EDITOR->set_binding (undef, undef, [],
1367 sub {
1368 my ($mod, $sym, $cmds) = @_;
1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1370 $refresh->();
1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show;
1373 },
1374 sub {
1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1377 },
1378 );
1379 $SETUP_DIALOG->hide;
1380 $::BIND_EDITOR->show;
1381 },
1382 );
1383
1384 $hb->add (new CFClient::UI::Button
1385 text => "close",
1386 tooltip => "Closes the binding window",
1387 expand => 1,
1388 on_activate => sub {
1389 $SETUP_DIALOG->hide;
1390 }
1391 );
1392
1393 $refresh->();
1394
1395 $vb
1396}
1397
1398sub help_window {
982 $BIND_WINDOW = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
983 title => "Bindings", 1400 x => 'center',
1401 y => 'center',
1402 z => 2,
1403 name => 'doc_browser',
984 def_w => int $WIDTH * 7/8, 1404 force_w => int $WIDTH * 7/8,
985 def_h => int $HEIGHT * 7/8, 1405 force_h => int $HEIGHT * 7/8,
1406 title => "Documentation";
1407
1408 $win->add (my $vbox = new CFClient::UI::VBox);
1409
1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4);
1413
1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox
1416 value => undef,
1417 options => [
1418 [intro => "Introduction"],
1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
1421 [command_help => "Commands"],
1422 [dmcommand_help => "DM Commands"],
1423 [COPYING => "License Terms"],
1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1427
1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1430
1431 $viewer->clear;
1432
1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1434 for @$pom;
1435
1436 $viewer->set_offset (0);
1437 },
986 on_visibility_change => sub { 1438 on_visibility_change => sub {
987 my ($self, $visible) = @_; 1439 my ($self, $visible) = @_;
988 if ($visible) { 1440 return unless $visible;
989 $self->center; 1441 return if $self->{value};
990 $refresh->() 1442 $self->set_value ("intro");
991 }
992 }; 1443 },
993
994 $BIND_WINDOW->add ($binding_list);
995 $refresh->();
996 $BIND_WINDOW
997}
998
999sub make_help_window {
1000 my $win = new CFClient::UI::FancyFrame
1001 def_w => int $WIDTH * 7/8,
1002 def_h => int $HEIGHT * 7/8,
1003 title => "Documentation";
1004
1005 $win->add (my $vbox = new CFClient::UI::VBox);
1006
1007 $vbox->add (my $buttons = new CFClient::UI::HBox);
1008 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1009
1010 for (
1011 [intro => "Introduction"],
1012 [manual => "Manual"],
1013 [command_help => "Commands"],
1014 [skill_help => "Skills"],
1015 ) {
1016 my ($pod, $label) = @$_;
1017
1018 $buttons->add (new CFClient::UI::Button
1019 text => $label,
1020 on_activate => sub {
1021 my $parser = new Pod::POM;
1022 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1023
1024 $viewer->clear;
1025
1026 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1027 for @{ CFClient::pod_to_pango_list $pom };
1028
1029 $viewer->set_offset (0);
1030 },
1031 ); 1444 );
1032 }
1033
1034 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1035 1445
1036 $win 1446 $win
1037} 1447}
1038 1448
1039sub sdl_init { 1449sub sdl_init {
… …
1069 if ($DEBUG_STATUS) { 1479 if ($DEBUG_STATUS) {
1070 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1480 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071 } else { 1481 } else {
1072 # create the widgets 1482 # create the widgets
1073 1483
1074 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1484 $DEBUG_STATUS = new CFClient::UI::Label
1485 padding => 0,
1486 z => 100,
1487 force_x => "max",
1488 force_y => 0;
1075 $DEBUG_STATUS->show; 1489 $DEBUG_STATUS->show;
1076 1490
1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1492
1077 $STATUSBOX = new CFClient::UI::Statusbox; 1493 $STATUSBOX = new CFClient::UI::Statusbox;
1078 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1079 1495
1080 (new CFClient::UI::Frame 1496 (new CFClient::UI::Frame
1081 bg => [0, 0, 0, 0.4], 1497 bg => [0, 0, 0, 0.4],
1082 req_y => -1, 1498 force_x => 0,
1499 force_y => "max",
1083 child => $STATUSBOX, 1500 child => $STATUSBOX,
1084 )->show; 1501 )->show;
1085 1502
1086 CFClient::UI::FancyFrame->new ( 1503 CFClient::UI::FancyFrame->new (
1504 title => "Map",
1505 name => "mapmap",
1506 x => 0,
1507 y => $FONTSIZE + 8,
1087 border_bg => [1, 1, 1, 192/255], 1508 border_bg => [1, 1, 1, 192/255],
1088 bg => [1, 1, 1, 0], 1509 bg => [1, 1, 1, 0],
1089 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1510 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1090 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1511 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091 ), 1512 ),
… …
1105 } 1526 }
1106 }); 1527 });
1107 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1108 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1109 1530
1110 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1111 expand => 1, 1532 expand => 1,
1112 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1113 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1114 can_hover => 1, 1536 can_hover => 1,
1115 can_events => 1, 1537 can_events => 1,
1116 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117 ; 1539 ;
1118 1540
1119 $BUTTONBAR = new CFClient::UI::HBox; 1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1542 title => "Setup",
1543 name => "setup_dialog",
1544 x => 'center',
1545 y => 'center',
1546 z => 2,
1547 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6,
1549 ;
1120 1550
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555 "Configure the server to play on, your username, password and other server-related options.");
1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask.");
1573
1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575
1121 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1122 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1577 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1578
1124 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1125 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1579 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1126 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1127 1581
1128 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1582 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1129 1583
1130 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1584 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1131 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1585 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1586 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1133 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1587 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1134 1589
1135 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1136 text => "Save Config", 1591 text => "Save Config",
1137 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1592 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1138 on_activate => sub { 1593 on_activate => sub {
1139 $::CFG->{layout} = CFClient::UI::get_layout; 1594 $::CFG->{layout} = CFClient::UI::get_layout;
1140 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1141 status "Configuration Saved"; 1596 status "Configuration Saved";
1142 }, 1597 },
1143 ); 1598 );
1144 1599
1145 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1146 tooltip => "View Documentation"); 1601 tooltip => "View Documentation");
1147
1148 $BUTTONBAR->add (new CFClient::UI::Flopper
1149 text => "Bindings",
1150 other => make_binding_window,
1151 tooltip => "Lets you delete bindings you have made with the recorder"
1152 );
1153 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1154 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1155 1602
1156 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1157 text => "Quit", 1604 text => "Quit",
1158 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
1159 on_activate => sub { 1606 on_activate => sub {
… …
1164 } 1611 }
1165 }, 1612 },
1166 ); 1613 );
1167 1614
1168 $BUTTONBAR->show; 1615 $BUTTONBAR->show;
1169 1616 $SETUP_DIALOG->show;
1170 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172 $SERVER_SETUP->show;
1173 } 1617 }
1618
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174} 1620}
1175 1621
1176sub video_shutdown { 1622sub video_shutdown {
1177 undef $SDL_ACTIVE; 1623 undef $SDL_ACTIVE;
1178} 1624}
… …
1245 1691
1246my %demo;#d# 1692my %demo;#d#
1247 1693
1248sub force_refresh { 1694sub force_refresh {
1249 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1695 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1250 debug sprintf "%3.2f", $fps; 1696 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251 1697
1252 $CFClient::UI::ROOT->draw; 1698 $CFClient::UI::ROOT->draw;
1253 1699
1254 $WANT_REFRESH = 0; 1700 $WANT_REFRESH = 0;
1255 $CAN_REFRESH = 0; 1701 $CAN_REFRESH = 0;
… …
1310}; 1756};
1311 1757
1312 CFClient::SDL_GL_SwapBuffers; 1758 CFClient::SDL_GL_SwapBuffers;
1313} 1759}
1314 1760
1315my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1316 $NOW = time; 1762 $NOW = time;
1317 1763
1318 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1764 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1319 for CFClient::SDL_PollEvent; 1765 for CFClient::SDL_PollEvent;
1320 1766
… …
1387############################################################################# 1833#############################################################################
1388 1834
1389$SIG{INT} = $SIG{TERM} = sub { exit }; 1835$SIG{INT} = $SIG{TERM} = sub { exit };
1390 1836
1391{ 1837{
1392 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1838 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable
1841 CFClient::fatal $_[0];
1842 };
1393 1843
1394 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1395 CFClient::UI::set_layout ($::CFG->{layout}); 1845 CFClient::UI::set_layout ($::CFG->{layout});
1396 1846
1397 my %DEF_CFG = ( 1847 my %DEF_CFG = (
1398 sdl_mode => 0, 1848 sdl_mode => 0,
1399 width => 640, 1849 width => 640,
… …
1403 map_scale => 1, 1853 map_scale => 1,
1404 fow_enable => 1, 1854 fow_enable => 1,
1405 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1406 fow_smooth => 0, 1856 fow_smooth => 0,
1407 gui_fontsize => 1, 1857 gui_fontsize => 1,
1408 log_fontsize => 1, 1858 log_fontsize => 0.7,
1409 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1410 gauge_size => 0.35, 1860 gauge_size => 0.35,
1411 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1412 mapsize => 100, 1862 mapsize => 100,
1413 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1414 say_command => 'say', 1864 say_command => 'say',
1415 audio_enable => 1, 1865 audio_enable => 1,
1416 bgm_enable => 1, 1866 bgm_enable => 1,
1417 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1418 face_prefetch => 0, 1868 face_prefetch => 0,
1419 output_sync => 1, 1869 output_sync => 1,
1420 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1421 ); 1872 );
1422 1873
1423 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1424 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1425 } 1876 }
… …
1477 1928
1478END { CFClient::SDL_Quit } 1929END { CFClient::SDL_Quit }
1479 1930
1480=head1 NAME 1931=head1 NAME
1481 1932
1482pclient - A Crossfire+ and Crossfire game client 1933cfplus - A Crossfire+ and Crossfire game client
1483 1934
1484=head1 SYNOPSIS 1935=head1 SYNOPSIS
1485 1936
1486Just run it - no commandline arguments are supported. 1937Just run it - no commandline arguments are supported.
1487 1938
1488=head1 USAGE 1939=head1 USAGE
1489 1940
1490Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1941cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1491fullscreen and interactively. 1942fullscreen and interactively.
1492 1943
1944=head1 DEBUGGING
1945
1946
1947CFPLUS_DEBUG - environment variable
1948
1949 1 draw borders around widgets
1950 2 add low-level widget info to tooltips
1951 4 show fps
1952 8 suppress tooltips
1953
1493=head1 AUTHOR 1954=head1 AUTHOR
1494 1955
1495Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1956Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1496 1957
1497 1958

Diff Legend

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