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.67 by root, Sun Jun 11 18:36:15 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
169 return unless $CONN; 369 return unless $CONN;
170 370
171 status "connection closed"; 371 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 372
373 destroy_query_dialog $CONN;
173 $CONN->destroy; 374 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 375 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 376}
179 377
180sub client_setup { 378sub 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); 379 my $vbox = new CFClient::UI::VBox;
380
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 381 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 382
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 383 $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); 384 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 385
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 386 $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"); 387 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 388
193 $mode_slider->connect (changed => sub { 389 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 390 my ($self, $value) = @_;
195 391
… …
312 on_activate => sub { 508 on_activate => sub {
313 video_shutdown (); 509 video_shutdown ();
314 video_init (); 510 video_init ();
315 } 511 }
316 ); 512 );
513
514 $vbox
515}
516
517sub audio_setup {
518 my $vbox = new CFClient::UI::VBox;
519
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
521
522 my $row = 0;
317 523
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 526 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.", 527 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 (); 558 audio_shutdown ();
353 audio_init (); 559 audio_init ();
354 } 560 }
355 ); 561 );
356 562
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $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} 564}
371 565
372sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 577
384sub make_gauge_window { 578sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 579 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 580
387 my $win = new CFClient::UI::Frame ( 581 my $win = new CFClient::UI::Frame (
388 req_y => -1, 582 force_x => 0,
583 force_y => "max",
389 user_w => $WIDTH, 584 force_w => $WIDTH,
390 user_h => $gh, 585 force_h => $gh,
391 ); 586 );
392 587
393 $win->add (my $hbox = new CFClient::UI::HBox 588 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 589 children => [
395 (new CFClient::UI::HBox expand => 1), 590 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
432 627
433 $win 628 $win
434} 629}
435 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
436sub make_stats_window { 659sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 660 my $tgw = new CFClient::UI::FancyFrame
661 y => $HEIGHT * (2/8),
662 x => "max",
663 title => "Stats",
664 name => "stats_window";
438 665
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 666 $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, 667 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 668 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."); 669 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 ({}); 768 update_stats_window ({});
542 769
543 $tgw 770 $tgw
544} 771}
545 772
546sub formsep { 773sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 775}
549 776
550sub update_stats_window { 777sub update_stats_window {
551 my ($stats) = @_; 778 my ($stats) = @_;
552 779
… …
614 841
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 843 for keys %tbl;
617} 844}
618 845
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; 846my $METASERVER_ATIME;
630 847
631sub update_metaserver { 848sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 849 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 850 $METASERVER_ATIME = time + 60;
636 851
637 my $table = $METASERVER->{table}; 852 my $table = $METASERVER->{table};
638 $table->clear; 853 $table->clear;
… …
659 874
660 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
661 876
662 $table->clear; 877 $table->clear;
663 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
664 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 891 for 0 .. $#col;
667 892
668 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
669 894
670 my $y = 0; 895 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
688 913
689 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
690 915
691 $y++; 916 $y++;
692 917
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
924 $METASERVER->hide;
925 },
696 }), 926 ),
697 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
698 ]); 928 ]);
699 929
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
701 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
702 for 0 .. $#$m; 938 for 0 .. $#$m;
703 } 939 }
704 } 940 }
705 }); 941 });
706} 942}
707 943
944sub metaserver_dialog {
945 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List",
947 name => 'metaserver_dialog',
948 x => 'center',
949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox),
953 on_visibility_change => sub {
954 update_metaserver if $_[1];
955 },
956 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962 $dialog
963}
964
708sub server_setup { 965sub 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); 966 my $vbox = new CFClient::UI::VBox;
713 967
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 968 $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"); 969 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716 970
717 { 971 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 973
720 $vbox->add ( 974 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 975 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 976 expand => 1,
723 text => $CFG->{host}, 977 text => $CFG->{host},
724 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725 on_changed => sub { 979 on_changed => sub {
726 my ($self, $value) = @_; 980 my ($self, $value) = @_;
… …
728 } 982 }
729 ); 983 );
730 984
731 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
732 986
733 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
734 expand => 1, 988 expand => 1,
735 text => "Server List", 989 text => "Server List",
736 other => $METASERVER, 990 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
738 on_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility },
739 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
740 }
741 ); 994 );
742 } 995 }
743 996
744 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
745 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
762 } 1015 }
763 ); 1016 );
764 1017
765 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766 $table->add (1, 7, new CFClient::UI::Slider 1019 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 1020 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1021 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 tooltip => "This is the size of the portion of the map update the server sends you. " 1022 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, " 1023 . "If you set this to a high value you will be able to see further, "
771 . "but you also increase bandwidth requirements and latency. " 1024 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 1025 . "This option is only used once at log-in.",
… …
812 $CONN ? stop_game 1065 $CONN ? stop_game
813 : start_game; 1066 : start_game;
814 }, 1067 },
815 ); 1068 );
816 1069
817 $dialog 1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1072 text => $CFG->{say_command},
1073 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. "
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub {
1077 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value;
1079 }
1080 );
1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
818} 1092}
819 1093
820sub message_window { 1094sub message_window {
821 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 1096 name => "message_window",
823 title => "Messages", 1097 title => "Messages",
824 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
826 user_w => int $::WIDTH / 3, 1100 x => "max",
1101 y => 0,
1102 force_w => $::WIDTH * 0.4,
827 user_h => int $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
828 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
829 1105
830 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
831 1107
832 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
864 }, 1140 },
865 ); 1141 );
866 1142
867 $CONSOLE = { 1143 $CONSOLE = {
868 window => $window, 1144 window => $window,
869 input => $input 1145 input => $input,
870 }; 1146 };
871 1147
872 $window 1148 $window
873} 1149}
874 1150
875sub open_quit_dialog { 1151sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 ;
879 1159
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 1161
882 $vb->add (new CFClient::UI::Label 1162 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 1163 text => "You should find a savebed and apply it first!",
… …
893 $hb->add (new CFClient::UI::Button 1173 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 1174 text => "Quit anyway",
895 expand => 1, 1175 expand => 1,
896 on_activate => sub { exit }, 1176 on_activate => sub { exit },
897 ); 1177 );
898
899 $QUIT_DIALOG->show_centered;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 } 1178 }
903}
904 1179
905sub make_inventory_window { 1180 $QUIT_DIALOG->show;
906 my $invwin = new CFClient::UI::FancyFrame 1181}
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";
908 1182
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1183sub autopickup_setup {
1184 my $table = new CFClient::UI::Table;
910 1185
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1186 for (
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1187 ["General", 0, 0,
913 $lbl->set_text ("Player"); 1188 ["Enable autopickup" => PICKUP_NEWMODE],
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
1193 ["Weapons", 0, 6,
1194 ["All weapons" => PICKUP_ALLWEAPON],
1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1196 ["Bows" => PICKUP_BOW],
1197 ["Arrows" => PICKUP_ARROW],
1198 ],
1199 ["Armour", 0, 12,
1200 ["Helmets" => PICKUP_HELMET],
1201 ["Shields" => PICKUP_SHIELD],
1202 ["Body Armour" => PICKUP_ARMOUR],
1203 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
915 1207
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1208 ["Readables", 2, 2,
1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
1213 ["Misc", 2, 7,
1214 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
1225 )
1226 {
1227 my ($title, $x, $y, @bits) = @$_;
1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
917 1229
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1230 for (@bits) {
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1231 ++$y;
1232
1233 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask,
1237 on_changed => sub {
1238 my ($box, $value) = @_;
1239
1240 if ($value) {
1241 $::CFG->{pickup} |= $mask;
1242 } else {
1243 $::CFG->{pickup} &= ~$mask;
1244 }
1245
1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN;
1248 });
1249 }
1250 }
1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
920 $hb2->add (new CFClient::UI::Button 1263 $table->add (3, 18, new CFClient::UI::Button
921 text => "Close", 1264 text => "set",
922 tooltip => "Close the currently open container (if one is open)",
923 on_activate => sub { 1265 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}") 1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
925 if $CONN->{open_container} != 0; 1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
1274sub inventory_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center",
1277 y => "center",
1278 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10,
1280 title => "Inventory",
1281 ;
1282
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1284
1285 $hb->add (my $vb1 = new CFClient::UI::VBox);
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1288
1289 $hb->add (my $vb2 = new CFClient::UI::VBox);
1290
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1292
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1294
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299}
1300
1301sub spell_setup {
1302 new CFClient::UI::SpellList
1303}
1304
1305sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox;
1307
1308 my $refresh;
1309 $refresh = sub {
1310 $binding_list->clear ();
1311
1312 for my $mod (keys %{$::CFG->{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316
1317 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button
1321 text => "delete",
1322 tooltip => "Deletes the binding",
1323 on_activate => sub {
1324 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym};
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 });
1349
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 }
1353 }
1354 };
1355
1356 my $vb = new CFClient::UI::VBox;
1357 $vb->add ($binding_list);
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359
1360 $hb->add (new CFClient::UI::Button
1361 text => "record new",
1362 expand => 1,
1363 tooltip => "This button opens the binding editor with an empty binding.",
1364 on_activate => sub {
1365 $::BIND_EDITOR->set_binding (undef, undef, [],
1366 sub {
1367 my ($mod, $sym, $cmds) = @_;
1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1369 $refresh->();
1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show;
1372 },
1373 sub {
1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1375 $SETUP_DIALOG->show;
1376 },
1377 );
1378 $SETUP_DIALOG->hide;
1379 $::BIND_EDITOR->show;
926 }, 1380 },
927 ); 1381 );
928 1382
929 $INVR_LBL->set_text ("Floor"); 1383 $hb->add (new CFClient::UI::Button
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1384 text => "close",
1385 tooltip => "Closes the binding window",
1386 expand => 1,
1387 on_activate => sub {
1388 $SETUP_DIALOG->hide;
1389 }
1390 );
931 1391
932 $invwin 1392 $refresh->();
933}
934 1393
1394 $vb
1395}
1396
935sub make_help_window { 1397sub help_window {
936 my $win = new CFClient::UI::FancyFrame 1398 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1399 x => 'center',
1400 y => 'center',
1401 z => 2,
1402 name => 'doc_browser',
1403 force_w => int $WIDTH * 7/8,
1404 force_h => int $HEIGHT * 7/8,
1405 title => "Documentation";
938 1406
939 $win->add (my $vbox = new CFClient::UI::VBox); 1407 $win->add (my $vbox = new CFClient::UI::VBox);
940 1408
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1409 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4);
943 1412
944 for ( 1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1414 $buttons->add (my $combo = new CFClient::UI::Combobox
1415 value => undef,
1416 options => [
945 [intro => "Introduction"], 1417 [intro => "Introduction"],
946 [manual => "Manual"], 1418 [manual => "Manual"],
1419 [skill_help => "Skills"],
947 [command_help => "Commands"], 1420 [command_help => "Commands"],
948 [skill_help => "Skills"], 1421 [dmcommand_help => "DM Commands"],
949 ) { 1422 [COPYING => "License Terms"],
950 my ($pod, $label) = @$_; 1423 ],
1424 on_changed => sub {
1425 my ($self, $pod) = @_;
951 1426
952 $buttons->add (new CFClient::UI::Button 1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
953 text => $label, 1428 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 1429
958 $viewer->clear; 1430 $viewer->clear;
959 1431
960 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
961 for @{ CFClient::pod_to_pango_list $pom }; 1433 for @$pom;
962 1434
963 $viewer->set_offset (0); 1435 $viewer->set_offset (0);
964 }, 1436 },
1437 on_visibility_change => sub {
1438 my ($self, $visible) = @_;
1439 return unless $visible;
1440 return if $self->{value};
1441 $self->set_value ("intro");
1442 },
965 ); 1443 );
966 }
967
968 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
969 1444
970 $win 1445 $win
971} 1446}
972 1447
973sub sdl_init { 1448sub sdl_init {
… …
1003 if ($DEBUG_STATUS) { 1478 if ($DEBUG_STATUS) {
1004 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1479 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005 } else { 1480 } else {
1006 # create the widgets 1481 # create the widgets
1007 1482
1008 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1483 $DEBUG_STATUS = new CFClient::UI::Label
1484 padding => 0,
1485 z => 100,
1486 force_x => "max",
1487 force_y => 0;
1009 $DEBUG_STATUS->show; 1488 $DEBUG_STATUS->show;
1010 1489
1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1491
1011 $STATUSBOX = new CFClient::UI::Statusbox; 1492 $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]); 1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1013 1494
1014 (new CFClient::UI::Frame 1495 (new CFClient::UI::Frame
1015 bg => [0, 0, 0, 0.4], 1496 bg => [0, 0, 0, 0.4],
1016 req_y => -1, 1497 force_x => 0,
1498 force_y => "max",
1017 child => $STATUSBOX, 1499 child => $STATUSBOX,
1018 )->show; 1500 )->show;
1019 1501
1020 CFClient::UI::FancyFrame->new ( 1502 CFClient::UI::FancyFrame->new (
1503 title => "Map",
1504 name => "mapmap",
1505 x => 0,
1506 y => $FONTSIZE + 8,
1021 border_bg => [1, 1, 1, 192/255], 1507 border_bg => [1, 1, 1, 192/255],
1022 bg => [1, 1, 1, 0], 1508 bg => [1, 1, 1, 0],
1023 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1509 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.", 1510 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025 ), 1511 ),
… …
1039 } 1525 }
1040 }); 1526 });
1041 $MAPWIDGET->show; 1527 $MAPWIDGET->show;
1042 $MAPWIDGET->focus_in; 1528 $MAPWIDGET->focus_in;
1043 1529
1044 $LOGVIEW = new CFClient::UI::TextView 1530 $LOGVIEW = new CFClient::UI::TextScroller
1045 expand => 1, 1531 expand => 1,
1046 font => $FONT_FIXED, 1532 font => $FONT_FIXED,
1047 fontsize => $::CFG->{log_fontsize}, 1533 fontsize => $::CFG->{log_fontsize},
1534 indent => -4,
1048 can_hover => 1, 1535 can_hover => 1,
1049 can_events => 1, 1536 can_events => 1,
1050 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1537 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051 ; 1538 ;
1052 1539
1053 $BUTTONBAR = new CFClient::UI::HBox; 1540 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1541 title => "Setup",
1542 name => "setup_dialog",
1543 x => 'center',
1544 y => 'center',
1545 z => 2,
1546 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6,
1548 ;
1054 1549
1550 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1554 "Configure the server to play on, your username, password and other server-related options.");
1555 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1556 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings."
1563 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1564 . "with nothing set and the recording started. After doing the actions you "
1565 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1566 . "After pressing the combo the binding will be saved automatically and the "
1567 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask.");
1572
1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1574
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1575 $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."); 1576 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, 1577
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, 1578 $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."); 1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1061 1580
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 1581 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 1582
1064 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1583 $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."); 1584 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, 1585 $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 :)."); 1586 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1068 1588
1069 $BUTTONBAR->add (new CFClient::UI::Button 1589 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1590 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.", 1591 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 { 1592 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1593 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075 status "Configuration Saved"; 1595 status "Configuration Saved";
1076 }, 1596 },
1077 ); 1597 );
1078 1598
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1080 tooltip => "View Documentation"); 1600 tooltip => "View Documentation");
1081 1601
1082 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1083 text => "Quit", 1603 text => "Quit",
1084 tooltip => "Terminates the program", 1604 tooltip => "Terminates the program",
… …
1090 } 1610 }
1091 }, 1611 },
1092 ); 1612 );
1093 1613
1094 $BUTTONBAR->show; 1614 $BUTTONBAR->show;
1095 1615 $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 } 1616 }
1617
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1106} 1619}
1107 1620
1108sub video_shutdown { 1621sub video_shutdown {
1109 undef $SDL_ACTIVE; 1622 undef $SDL_ACTIVE;
1110} 1623}
… …
1177 1690
1178my %demo;#d# 1691my %demo;#d#
1179 1692
1180sub force_refresh { 1693sub force_refresh {
1181 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1694 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1182 debug sprintf "%3.2f", $fps; 1695 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183 1696
1184 $CFClient::UI::ROOT->draw; 1697 $CFClient::UI::ROOT->draw;
1185 1698
1186 $WANT_REFRESH = 0; 1699 $WANT_REFRESH = 0;
1187 $CAN_REFRESH = 0; 1700 $CAN_REFRESH = 0;
… …
1242}; 1755};
1243 1756
1244 CFClient::SDL_GL_SwapBuffers; 1757 CFClient::SDL_GL_SwapBuffers;
1245} 1758}
1246 1759
1247my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1760my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1248 $NOW = time; 1761 $NOW = time;
1249 1762
1250 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1763 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1251 for CFClient::SDL_PollEvent; 1764 for CFClient::SDL_PollEvent;
1252 1765
… …
1319############################################################################# 1832#############################################################################
1320 1833
1321$SIG{INT} = $SIG{TERM} = sub { exit }; 1834$SIG{INT} = $SIG{TERM} = sub { exit };
1322 1835
1323{ 1836{
1324 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1837 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable
1840 CFClient::fatal $_[0];
1841 };
1325 1842
1326 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327 CFClient::UI::set_layout ($::CFG->{layout}); 1844 CFClient::UI::set_layout ($::CFG->{layout});
1328 1845
1329 my %DEF_CFG = ( 1846 my %DEF_CFG = (
1330 sdl_mode => 0, 1847 sdl_mode => 0,
1331 width => 640, 1848 width => 640,
… …
1335 map_scale => 1, 1852 map_scale => 1,
1336 fow_enable => 1, 1853 fow_enable => 1,
1337 fow_intensity => 0.45, 1854 fow_intensity => 0.45,
1338 fow_smooth => 0, 1855 fow_smooth => 0,
1339 gui_fontsize => 1, 1856 gui_fontsize => 1,
1340 log_fontsize => 1, 1857 log_fontsize => 0.7,
1341 gauge_fontsize=> 1, 1858 gauge_fontsize=> 1,
1342 gauge_size => 0.35, 1859 gauge_size => 0.35,
1343 stat_fontsize => 1, 1860 stat_fontsize => 0.7,
1344 mapsize => 100, 1861 mapsize => 100,
1345 host => "crossfire.schmorp.de", 1862 host => "crossfire.schmorp.de",
1346 say_command => 'say', 1863 say_command => 'say',
1347 audio_enable => 1, 1864 audio_enable => 1,
1348 bgm_enable => 1, 1865 bgm_enable => 1,
1349 bgm_volume => 0.25, 1866 bgm_volume => 0.25,
1350 face_prefetch => 0, 1867 face_prefetch => 0,
1351 output_sync => 1, 1868 output_sync => 1,
1352 output_count => 1, 1869 output_count => 1,
1870 pickup => 0,
1353 ); 1871 );
1354 1872
1355 while (my ($k, $v) = each %DEF_CFG) { 1873 while (my ($k, $v) = each %DEF_CFG) {
1356 $CFG->{$k} = $v unless exists $CFG->{$k}; 1874 $CFG->{$k} = $v unless exists $CFG->{$k};
1357 } 1875 }
… …
1409 1927
1410END { CFClient::SDL_Quit } 1928END { CFClient::SDL_Quit }
1411 1929
1412=head1 NAME 1930=head1 NAME
1413 1931
1414pclient - A Crossfire+ and Crossfire game client 1932cfplus - A Crossfire+ and Crossfire game client
1415 1933
1416=head1 SYNOPSIS 1934=head1 SYNOPSIS
1417 1935
1418Just run it - no commandline arguments are supported. 1936Just run it - no commandline arguments are supported.
1419 1937
1420=head1 USAGE 1938=head1 USAGE
1421 1939
1422Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1940cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423fullscreen and interactively. 1941fullscreen and interactively.
1424 1942
1943=head1 DEBUGGING
1944
1945
1946CFPLUS_DEBUG - environment variable
1947
1948 1 draw borders around widgets
1949 2 add low-level widget info to tooltips
1950 4 show fps
1951 8 suppress tooltips
1952
1425=head1 AUTHOR 1953=head1 AUTHOR
1426 1954
1427Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1955Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1428 1956
1429 1957

Diff Legend

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