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.38 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.73 by root, Sat Jun 17 15:07:54 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;
109our $BIND_EDITOR; 119our $BIND_EDITOR;
110 120
111our $SPELL_LIST; 121our $PICKUP_CFG;
112 122
113sub status { 123sub status {
114 $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]);
115} 125}
116 126
117sub debug { 127sub debug {
118 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
119} 129}
120 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;
310}
311
121sub start_game { 312sub start_game {
122 status "logging in..."; 313 status "logging in...";
123 314
124 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
126 317
127 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;
128 319
129 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
130 321
… …
142 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
143 logview => $LOGVIEW, 334 logview => $LOGVIEW,
144 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
145 map => $MAP, 336 map => $MAP,
146 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
147 339
148 sound_play => sub { 340 sound_play => sub {
149 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
150 342
151 $SDL_MIXER 343 $SDL_MIXER
… …
168 } 360 }
169} 361}
170 362
171sub stop_game { 363sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
174 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
175 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
176 369
177 return unless $CONN; 370 return unless $CONN;
178 371
179 status "connection closed"; 372 status "connection closed";
180 373
374 destroy_query_dialog $CONN;
181 $CONN->destroy; 375 $CONN->destroy;
182 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
183} 377}
184 378
185sub client_setup { 379sub graphics_setup {
186 my $dialog = new CFClient::UI::FancyFrame
187 x => 1,
188 y => $HEIGHT * (1/8),
189 name => "client_setup",
190 title => "Client Setup",
191 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
192 381
193 $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]);
194 383
195 $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");
196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
320 on_activate => sub { 509 on_activate => sub {
321 video_shutdown (); 510 video_shutdown ();
322 video_init (); 511 video_init ();
323 } 512 }
324 ); 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;
325 524
326 $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");
327 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
328 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
329 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.",
… …
360 audio_shutdown (); 559 audio_shutdown ();
361 audio_init (); 560 audio_init ();
362 } 561 }
363 ); 562 );
364 563
365 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
366 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
367 text => $CFG->{say_command},
368 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. "
369 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
370 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
371 on_changed => sub {
372 my ($self, $value) = @_;
373 $CFG->{say_command} = $value;
374 }
375 );
376
377 $dialog
378} 565}
379 566
380sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
381 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
382 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
440 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
441 628
442 $win 629 $win
443} 630}
444 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
445 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
446sub make_stats_window { 660sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
449 x => "max", 663 x => "max",
450 title => "Stats", 664 title => "Stats",
451 name => "stats_window"; 665 name => "stats_window";
… …
555 update_stats_window ({}); 769 update_stats_window ({});
556 770
557 $tgw 771 $tgw
558} 772}
559 773
560sub formsep { 774sub formsep($) {
561 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
562} 776}
563 777
564sub update_stats_window { 778sub update_stats_window {
565 my ($stats) = @_; 779 my ($stats) = @_;
566 780
… …
602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
604 818
605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
606 820
607 # TODO: replace by CS_STAT_RES_xxx constants
608 my %tbl = ( 821 my %tbl = (
609 phys => 100, 822 phys => CS_STAT_RES_PHYS,
610 magic => 101, 823 magic => CS_STAT_RES_MAG,
611 fire => 102, 824 fire => CS_STAT_RES_FIRE,
612 elec => 103, 825 elec => CS_STAT_RES_ELEC,
613 cold => 104, 826 cold => CS_STAT_RES_COLD,
614 conf => 105, 827 conf => CS_STAT_RES_CONF,
615 acid => 106, 828 acid => CS_STAT_RES_ACID,
616 drain => 107, 829 drain => CS_STAT_RES_DRAIN,
617 ghit => 108, 830 ghit => CS_STAT_RES_GHOSTHIT,
618 pois => 109, 831 pois => CS_STAT_RES_POISON,
619 slow => 110, 832 slow => CS_STAT_RES_SLOW,
620 para => 111, 833 para => CS_STAT_RES_PARA,
621 tund => 112, 834 tund => CS_STAT_TURN_UNDEAD,
622 fear => 113, 835 fear => CS_STAT_RES_FEAR,
623 depl => 113, 836 depl => CS_STAT_RES_DEPLETE,
624 deat => 115, 837 deat => CS_STAT_RES_DEATH,
625 holyw => 116, 838 holyw => CS_STAT_RES_HOLYWORD,
626 blind => 117, 839 blind => CS_STAT_RES_BLIND,
627 ); 840 );
628 841
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 843 for keys %tbl;
631} 844}
632 845
633sub metaserver_dialog {
634 my $dialog = new CFClient::UI::FancyFrame
635 title => "Server List",
636 child => (my $vbox = new CFClient::UI::VBox);
637
638 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
639
640 $dialog
641}
642
643my $METASERVER_ATIME; 846my $METASERVER_ATIME;
644 847
645sub update_metaserver { 848sub update_metaserver {
646 my ($HOST) = @_;
647
648 return if $METASERVER_ATIME > time; 849 return if $METASERVER_ATIME > time;
649 $METASERVER_ATIME = time + 60; 850 $METASERVER_ATIME = time + 60;
650 851
651 my $table = $METASERVER->{table}; 852 my $table = $METASERVER->{table};
652 $table->clear; 853 $table->clear;
… …
673 874
674 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
675 876
676 $table->clear; 877 $table->clear;
677 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 );
678 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
679 $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[$_])
680 for 0 .. $#col; 891 for 0 .. $#col;
681 892
682 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
683 894
684 my $y = 0; 895 my $y = 0;
685 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) {
… …
702 913
703 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
704 915
705 $y++; 916 $y++;
706 917
707 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
708 (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 {
709 $HOST->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
924 $METASERVER->hide;
925 },
710 }), 926 ),
711 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
712 ]); 928 ]);
713 929
714 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
715 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)
716 for 0 .. $#$m; 938 for 0 .. $#$m;
717 } 939 }
718 } 940 }
719 }); 941 });
720} 942}
721 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
722sub server_setup { 965sub server_setup {
723 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
724 x => "center",
725 y => "center",
726 name => "server_setup",
727 title => "Server Setup",
728 child => (my $vbox = new CFClient::UI::VBox), 966 my $vbox = new CFClient::UI::VBox;
729 ;
730 967
731 $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]);
732 $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");
733 970
734 { 971 {
735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
736 973
737 $vbox->add ( 974 $vbox->add (
738 my $HOST = new CFClient::UI::Entry 975 $HOST_ENTRY = new CFClient::UI::Entry
739 expand => 1, 976 expand => 1,
740 text => $CFG->{host}, 977 text => $CFG->{host},
741 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",
742 on_changed => sub { 979 on_changed => sub {
743 my ($self, $value) = @_; 980 my ($self, $value) = @_;
… …
745 } 982 }
746 ); 983 );
747 984
748 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
749 986
750 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
751 expand => 1, 988 expand => 1,
752 text => "Server List", 989 text => "Server List",
753 other => $METASERVER, 990 other => $METASERVER,
754 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
755 on_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility },
756 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
757 }
758 ); 994 );
759 } 995 }
760 996
761 $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");
762 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
829 $CONN ? stop_game 1065 $CONN ? stop_game
830 : start_game; 1066 : start_game;
831 }, 1067 },
832 ); 1068 );
833 1069
834 $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
835} 1092}
836 1093
837sub message_window { 1094sub message_window {
838 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
839 name => "message_window", 1096 name => "message_window",
840 title => "Messages", 1097 title => "Messages",
841 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
842 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
843 x => "max", 1100 x => "max",
844 y => 0, 1101 y => 0,
845 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
846 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
847 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
848 1105
849 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
850 1107
851 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
865 }, 1122 },
866 on_activate => sub { 1123 on_activate => sub {
867 my ($input, $text) = @_; 1124 my ($input, $text) = @_;
868 $input->set_text (''); 1125 $input->set_text ('');
869 1126
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
875 } elsif ($text =~ /^\/(.*)/) { 1127 if ($text =~ /^\/(.*)/) {
876 $::CONN->user_send ($1); 1128 $::CONN->user_send ($1);
877 } else { 1129 } else {
878 my $say_cmd = $::CFG->{say_command} || 'say'; 1130 my $say_cmd = $::CFG->{say_command} || 'say';
879 $::CONN->user_send ("$say_cmd $text"); 1131 $::CONN->user_send ("$say_cmd $text");
880 } 1132 }
… …
899sub open_quit_dialog { 1151sub open_quit_dialog {
900 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
901 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center", 1154 x => "center",
903 y => "center", 1155 y => "center",
1156 z => 50,
904 title => "Really Quit?", 1157 title => "Really Quit?",
905 ; 1158 ;
906 1159
907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
908 1161
… …
925 } 1178 }
926 1179
927 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
928} 1181}
929 1182
1183sub autopickup_setup {
1184 my $table = new CFClient::UI::Table;
1185
1186 for (
1187 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE],
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 ],
1207
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]);
1229
1230 for (@bits) {
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 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
930sub make_inventory_window { 1274sub inventory_window {
931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
932 x => "center", 1276 x => "center",
933 y => "center", 1277 y => "center",
934 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
935 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
… …
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953 1297
954 $invwin 1298 $invwin
955} 1299}
956 1300
957sub make_spell_list { 1301sub spell_setup {
958 $SPELL_LIST = new CFClient::UI::SpellList 1302 new CFClient::UI::SpellList
959 force_w => $WIDTH * (9/10),
960 force_h => $HEIGHT * (9/10);
961 $SPELL_LIST
962} 1303}
963 1304
964sub make_binding_window { 1305sub keyboard_setup {
965 my $binding_list = new CFClient::UI::VBox; 1306 my $binding_list = new CFClient::UI::VBox;
966 1307
967 my $refresh; 1308 my $refresh;
968 $refresh = sub { 1309 $refresh = sub {
969 $binding_list->clear (); 1310 $binding_list->clear ();
… …
993 sub { 1334 sub {
994 my ($nmod, $nsym, $ncmds) = @_; 1335 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym}; 1336 delete $::CFG->{bindings}->{$mod}->{$sym};
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
997 $refresh->(); 1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
998 $::BIND_WINDOW->show; 1340 $SETUP_DIALOG->show;
999 }, 1341 },
1000 sub { 1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1001 $::BIND_WINDOW->show; 1344 $SETUP_DIALOG->show;
1002 }); 1345 });
1003 $::BIND_EDITOR->show; 1346 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide; 1347 $SETUP_DIALOG->hide;
1005 }); 1348 });
1006 1349
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 } 1352 }
1010 } 1353 }
1011 }; 1354 };
1012 1355
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame 1356 my $vb = new CFClient::UI::VBox;
1014 title => "Bindings",
1015 x => "center",
1016 y => "center",
1017 def_w => int $WIDTH * 9/10,
1018 def_h => int $HEIGHT * 9/10,
1019 on_visibility_change => sub {
1020 my ($self, $visible) = @_;
1021 $refresh->() if $visible;
1022 };
1023
1024 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1357 $vb->add (my $hb = new CFClient::UI::HBox);
1358 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1359 $hb->add (new CFClient::UI::CheckBox
1360 expand => 1,
1361 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub {
1364 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value;
1366 });
1367
1025 $vb->add ($binding_list); 1368 $vb->add ($binding_list);
1026 $vb->add (my $hb = new CFClient::UI::HBox); 1369 $vb->add (my $hb = new CFClient::UI::HBox);
1370
1027 $hb->add (new CFClient::UI::Button 1371 $hb->add (new CFClient::UI::Button
1028 text => "record new", 1372 text => "record new",
1029 expand => 1, 1373 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.", 1374 tooltip => "This button opens the binding editor with an empty binding.",
1031 on_activate => sub { 1375 on_activate => sub {
1032 $::BIND_EDITOR->set_binding (undef, undef, [], 1376 $::BIND_EDITOR->set_binding (undef, undef, [],
1033 sub { 1377 sub {
1034 my ($mod, $sym, $cmds) = @_; 1378 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1036 $refresh->(); 1380 $refresh->();
1037 $::BIND_WINDOW->show; 1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show;
1038 }, 1383 },
1039 sub { 1384 sub {
1040 $::BIND_WINDOW->show; 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1041 }); 1387 },
1042 $::BIND_WINDOW->hide; 1388 );
1389 $SETUP_DIALOG->hide;
1043 $::BIND_EDITOR->show; 1390 $::BIND_EDITOR->show;
1044 }, 1391 },
1045 ); 1392 );
1393
1046 $hb->add (new CFClient::UI::Button 1394 $hb->add (new CFClient::UI::Button
1047 text => "close", 1395 text => "close",
1048 tooltip => "Closes the binding window", 1396 tooltip => "Closes the binding window",
1049 expand => 1, 1397 expand => 1,
1050 on_activate => sub { 1398 on_activate => sub {
1051 $::BIND_WINDOW->hide; 1399 $SETUP_DIALOG->hide;
1052 } 1400 }
1053 ); 1401 );
1054 1402
1055 $refresh->(); 1403 $refresh->();
1056 $BIND_WINDOW
1057}
1058 1404
1405 $vb
1406}
1407
1059sub make_help_window { 1408sub help_window {
1060 my $win = new CFClient::UI::FancyFrame 1409 my $win = new CFClient::UI::FancyFrame
1410 x => 'center',
1411 y => 'center',
1412 z => 2,
1413 name => 'doc_browser',
1061 def_w => int $WIDTH * 7/8, 1414 force_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8, 1415 force_h => int $HEIGHT * 7/8,
1063 title => "Documentation"; 1416 title => "Documentation";
1064 1417
1065 $win->add (my $vbox = new CFClient::UI::VBox); 1418 $win->add (my $vbox = new CFClient::UI::VBox);
1066 1419
1067 $vbox->add (my $buttons = new CFClient::UI::HBox); 1420 $vbox->add (my $buttons = new CFClient::UI::HBox);
1068 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1422 expand => 1, fontsize => 0.8, padding_x => 4);
1069 1423
1070 for ( 1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef,
1427 options => [
1071 [intro => "Introduction"], 1428 [intro => "Introduction"],
1072 [manual => "Manual"], 1429 [manual => "Manual"],
1430 [skill_help => "Skills"],
1073 [command_help => "Commands"], 1431 [command_help => "Commands"],
1074 [skill_help => "Skills"], 1432 [dmcommand_help => "DM Commands"],
1075 ) { 1433 [COPYING => "License Terms"],
1076 my ($pod, $label) = @$_; 1434 ],
1435 on_changed => sub {
1436 my ($self, $pod) = @_;
1077 1437
1078 $buttons->add (new CFClient::UI::Button 1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1079 text => $label, 1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1080 on_activate => sub {
1081 my $parser = new Pod::POM;
1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1083 1440
1084 $viewer->clear; 1441 $viewer->clear;
1085 1442
1086 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1087 for @{ CFClient::pod_to_pango_list $pom }; 1444 for @$pom;
1088 1445
1089 $viewer->set_offset (0); 1446 $viewer->set_offset (0);
1090 }, 1447 },
1448 on_visibility_change => sub {
1449 my ($self, $visible) = @_;
1450 return unless $visible;
1451 return if $self->{value};
1452 $self->set_value ("intro");
1453 },
1091 ); 1454 );
1092 }
1093
1094 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1095 1455
1096 $win 1456 $win
1097} 1457}
1098 1458
1099sub sdl_init { 1459sub sdl_init {
… …
1139 $DEBUG_STATUS->show; 1499 $DEBUG_STATUS->show;
1140 1500
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142 1502
1143 $STATUSBOX = new CFClient::UI::Statusbox; 1503 $STATUSBOX = new CFClient::UI::Statusbox;
1144 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1504 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1145 1505
1146 (new CFClient::UI::Frame 1506 (new CFClient::UI::Frame
1147 bg => [0, 0, 0, 0.4], 1507 bg => [0, 0, 0, 0.4],
1148 force_x => 0, 1508 force_x => 0,
1149 force_y => "max", 1509 force_y => "max",
1150 child => $STATUSBOX, 1510 child => $STATUSBOX,
1151 )->show; 1511 )->show;
1152 1512
1153 CFClient::UI::FancyFrame->new ( 1513 CFClient::UI::FancyFrame->new (
1514 title => "Map",
1515 name => "mapmap",
1154 x => 0, 1516 x => 0,
1155 y => $FONTSIZE + 8, 1517 y => $FONTSIZE + 8,
1156 border_bg => [1, 1, 1, 192/255], 1518 border_bg => [1, 1, 1, 192/255],
1157 bg => [1, 1, 1, 0], 1519 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1159 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1160 ), 1523 ),
1161 )->show; 1524 )->show;
1162 1525
… …
1174 } 1537 }
1175 }); 1538 });
1176 $MAPWIDGET->show; 1539 $MAPWIDGET->show;
1177 $MAPWIDGET->focus_in; 1540 $MAPWIDGET->focus_in;
1178 1541
1179 $LOGVIEW = new CFClient::UI::TextView 1542 $LOGVIEW = new CFClient::UI::TextScroller
1180 expand => 1, 1543 expand => 1,
1181 font => $FONT_FIXED, 1544 font => $FONT_FIXED,
1182 fontsize => $::CFG->{log_fontsize}, 1545 fontsize => $::CFG->{log_fontsize},
1546 indent => -4,
1183 can_hover => 1, 1547 can_hover => 1,
1184 can_events => 1, 1548 can_events => 1,
1185 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1549 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1186 ; 1550 ;
1187 1551
1552 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1553 title => "Setup",
1554 name => "setup_dialog",
1555 x => 'center',
1556 y => 'center',
1557 z => 2,
1558 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6,
1560 ;
1561
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1566 "Configure the server to play on, your username, password and other server-related options.");
1567 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1568 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings."
1575 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1576 . "with nothing set and the recording started. After doing the actions you "
1577 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask.");
1584
1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1189 1586
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1191 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1588 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1589
1193 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1194 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1590 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1195 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1591 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1196 1592
1197 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 1593 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
1198 1594
1199 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1200 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1201 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1202 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1598 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1203 ."You can also hit the Tab-key to show/hide the Inventory."); 1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1204 1600
1205 $BUTTONBAR->add (new CFClient::UI::Button 1601 $BUTTONBAR->add (new CFClient::UI::Button
1206 text => "Save Config", 1602 text => "Save Config",
1207 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1603 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1208 on_activate => sub { 1604 on_activate => sub {
… …
1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1211 status "Configuration Saved"; 1607 status "Configuration Saved";
1212 }, 1608 },
1213 ); 1609 );
1214 1610
1215 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1216 tooltip => "View Documentation"); 1612 tooltip => "View Documentation");
1217
1218 $BUTTONBAR->add (new CFClient::UI::Flopper
1219 text => "Bindings",
1220 other => make_binding_window,
1221 tooltip =>
1222 "Lets you define, edit and delete bindings."
1223 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1224 ."with nothing set and the recording started. After doing the actions you "
1225 ."want to record press Insert and you will be asked to press a key-combo."
1226 ."After pressing the combo the binding will be saved automatically and the "
1227 ."binding editor closes");
1228
1229 $BUTTONBAR->add (new CFClient::UI::Flopper
1230 text => "Spells",
1231 other => make_spell_list,
1232 tooltip => "The spell list");
1233 1613
1234 $BUTTONBAR->add (new CFClient::UI::Button 1614 $BUTTONBAR->add (new CFClient::UI::Button
1235 text => "Quit", 1615 text => "Quit",
1236 tooltip => "Terminates the program", 1616 tooltip => "Terminates the program",
1237 on_activate => sub { 1617 on_activate => sub {
… …
1242 } 1622 }
1243 }, 1623 },
1244 ); 1624 );
1245 1625
1246 $BUTTONBAR->show; 1626 $BUTTONBAR->show;
1247 $SERVER_SETUP->show; 1627 $SETUP_DIALOG->show;
1248
1249 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1250 } 1628 }
1629
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1251} 1631}
1252 1632
1253sub video_shutdown { 1633sub video_shutdown {
1634 CFClient::OpenGL::shutdown;
1635
1254 undef $SDL_ACTIVE; 1636 undef $SDL_ACTIVE;
1255} 1637}
1256 1638
1257my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1639my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1258my $bgmusic;#TODO#hack#d# 1640my $bgmusic;#TODO#hack#d#
… …
1387}; 1769};
1388 1770
1389 CFClient::SDL_GL_SwapBuffers; 1771 CFClient::SDL_GL_SwapBuffers;
1390} 1772}
1391 1773
1392my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1774my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1393 $NOW = time; 1775 $NOW = time;
1394 1776
1395 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1777 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1396 for CFClient::SDL_PollEvent; 1778 for CFClient::SDL_PollEvent;
1397 1779
… …
1464############################################################################# 1846#############################################################################
1465 1847
1466$SIG{INT} = $SIG{TERM} = sub { exit }; 1848$SIG{INT} = $SIG{TERM} = sub { exit };
1467 1849
1468{ 1850{
1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1851 local $SIG{__DIE__} = sub {
1852 return unless defined $^S && !$^S;
1853 Carp::confess $_[1];#d#TODO: remove when stable
1854 CFClient::fatal $_[0];
1855 };
1470 1856
1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1857 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout}); 1858 CFClient::UI::set_layout ($::CFG->{layout});
1473 1859
1474 my %DEF_CFG = ( 1860 my %DEF_CFG = (
… …
1480 map_scale => 1, 1866 map_scale => 1,
1481 fow_enable => 1, 1867 fow_enable => 1,
1482 fow_intensity => 0.45, 1868 fow_intensity => 0.45,
1483 fow_smooth => 0, 1869 fow_smooth => 0,
1484 gui_fontsize => 1, 1870 gui_fontsize => 1,
1485 log_fontsize => 1, 1871 log_fontsize => 0.7,
1486 gauge_fontsize=> 1, 1872 gauge_fontsize=> 1,
1487 gauge_size => 0.35, 1873 gauge_size => 0.35,
1488 stat_fontsize => 1, 1874 stat_fontsize => 0.7,
1489 mapsize => 100, 1875 mapsize => 100,
1490 host => "crossfire.schmorp.de", 1876 host => "crossfire.schmorp.de",
1491 say_command => 'say', 1877 say_command => 'say',
1492 audio_enable => 1, 1878 audio_enable => 1,
1493 bgm_enable => 1, 1879 bgm_enable => 1,
1494 bgm_volume => 0.25, 1880 bgm_volume => 0.25,
1495 face_prefetch => 0, 1881 face_prefetch => 0,
1496 output_sync => 1, 1882 output_sync => 1,
1497 output_count => 1, 1883 output_count => 1,
1884 pickup => 0,
1498 ); 1885 );
1499 1886
1500 while (my ($k, $v) = each %DEF_CFG) { 1887 while (my ($k, $v) = each %DEF_CFG) {
1501 $CFG->{$k} = $v unless exists $CFG->{$k}; 1888 $CFG->{$k} = $v unless exists $CFG->{$k};
1502 } 1889 }
… …
1549 video_init; 1936 video_init;
1550 audio_init; 1937 audio_init;
1551} 1938}
1552 1939
1553Event::loop; 1940Event::loop;
1941#CFClient::SDL_Quit;
1942#CFClient::_exit 0;
1554 1943
1555END { CFClient::SDL_Quit } 1944END { CFClient::SDL_Quit }
1556 1945
1557=head1 NAME 1946=head1 NAME
1558 1947
… …
1565=head1 USAGE 1954=head1 USAGE
1566 1955
1567cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1956cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1568fullscreen and interactively. 1957fullscreen and interactively.
1569 1958
1959=head1 DEBUGGING
1960
1961
1962CFPLUS_DEBUG - environment variable
1963
1964 1 draw borders around widgets
1965 2 add low-level widget info to tooltips
1966 4 show fps
1967 8 suppress tooltips
1968
1570=head1 AUTHOR 1969=head1 AUTHOR
1571 1970
1572Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1971Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1573 1972
1574 1973

Diff Legend

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