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.41 by root, Fri Jun 2 02:21:48 2006 UTC vs.
Revision 1.69 by root, Mon Jun 12 13:26: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
… …
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $HOST_ENTRY; 88our $HOST_ENTRY;
87our $SERVER_SETUP; 89our $SERVER_INFO;
88 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
89our $FLOORBOX; 99our $FLOORBOX;
90our $GAUGES; 100our $GAUGES;
91our $STATWIDS; 101our $STATWIDS;
92 102
93our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 114our $INV_WINDOW;
105our $INV; 115our $INV;
106our $INVR; 116our $INVR;
107our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
108 118
109our $BIND_WINDOW;
110our $BIND_EDITOR; 119our $BIND_EDITOR;
111 120
112our $SPELL_LIST; 121our $PICKUP_CFG;
113 122
114sub status { 123sub status {
115 $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]);
116} 125}
117 126
118sub debug { 127sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
120} 129}
121 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
122sub start_game { 312sub start_game {
123 status "logging in..."; 313 status "logging in...";
124 314
125 $LOGIN_BUTTON->set_text ("Logout"); 315 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 316 $SETUP_DIALOG->hide;
127 317
128 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;
129 319
130 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
131 321
… …
143 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW, 334 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
146 map => $MAP, 336 map => $MAP,
147 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
148 339
149 sound_play => sub { 340 sound_play => sub {
150 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
151 342
152 $SDL_MIXER 343 $SDL_MIXER
… …
169 } 360 }
170} 361}
171 362
172sub stop_game { 363sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
176 $LOGVIEW->hide; 368 $SETUP_SPELLS->clear_spells;
177 369
178 return unless $CONN; 370 return unless $CONN;
179 371
180 status "connection closed"; 372 status "connection closed";
181 373
374 destroy_query_dialog $CONN;
182 $CONN->destroy; 375 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
184} 377}
185 378
186sub client_setup { 379sub graphics_setup {
187 my $dialog = new CFClient::UI::FancyFrame
188 x => 1,
189 y => $HEIGHT * (1/8),
190 name => "client_setup",
191 title => "Client Setup",
192 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
193 381
194 $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]);
195 383
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
321 on_activate => sub { 509 on_activate => sub {
322 video_shutdown (); 510 video_shutdown ();
323 video_init (); 511 video_init ();
324 } 512 }
325 ); 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;
326 524
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
329 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
330 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.",
… …
361 audio_shutdown (); 559 audio_shutdown ();
362 audio_init (); 560 audio_init ();
363 } 561 }
364 ); 562 );
365 563
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368 text => $CFG->{say_command},
369 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. "
370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372 on_changed => sub {
373 my ($self, $value) = @_;
374 $CFG->{say_command} = $value;
375 }
376 );
377
378 $dialog
379} 565}
380 566
381sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
441 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
442 628
443 $win 629 $win
444} 630}
445 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
446 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
447sub make_stats_window { 660sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
449 y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
450 x => "max", 663 x => "max",
451 title => "Stats", 664 title => "Stats",
452 name => "stats_window"; 665 name => "stats_window";
… …
556 update_stats_window ({}); 769 update_stats_window ({});
557 770
558 $tgw 771 $tgw
559} 772}
560 773
561sub formsep { 774sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563} 776}
564 777
565sub update_stats_window { 778sub update_stats_window {
566 my ($stats) = @_; 779 my ($stats) = @_;
567 780
… …
662 875
663 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
664 877
665 $table->clear; 878 $table->clear;
666 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
667 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
668 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
669 for 0 .. $#col; 892 for 0 .. $#col;
670 893
671 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
672 895
673 my $y = 0; 896 my $y = 0;
674 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
691 914
692 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
693 916
694 $y++; 917 $y++;
695 918
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
697 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{host} = $host);
699 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 },
700 }), 927 ),
701 (new CFClient::UI::Empty expand => 1), 928 (new CFClient::UI::Empty expand => 1),
702 ]); 929 ]);
703 930
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 931 $table->add ($_, $y, new CFClient::UI::Label
705 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 932 ellipsise => 0,
933 align => $align[$_],
934 text => $m->[$_],
935 tooltip => $tip[$_],
936 can_hover => 1,
937 can_events => 1,
938 fontsize => 0.8)
706 for 0 .. $#$m; 939 for 0 .. $#$m;
707 } 940 }
708 } 941 }
709 }); 942 });
710} 943}
711 944
712sub metaserver_dialog { 945sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame 946 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List", 947 title => "Server List",
715 name => 'metaserver_dialog', 948 name => 'metaserver_dialog',
716 x => 'center', 949 x => 'center',
717 y => 'center', 950 y => 'center',
951 z => 3,
952 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 953 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 954 on_visibility_change => sub {
720 update_metaserver if $_[1]; 955 update_metaserver if $_[1];
721 }, 956 },
722 ; 957 ;
723 958
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
725 962
726 $dialog 963 $dialog
727} 964}
728 965
729sub server_setup { 966sub server_setup {
730 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
731 x => "center",
732 y => "center",
733 name => "server_setup",
734 title => "Server Setup",
735 child => (my $vbox = new CFClient::UI::VBox), 967 my $vbox = new CFClient::UI::VBox;
736 ;
737 968
738 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
739 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
740 971
741 { 972 {
… …
758 expand => 1, 989 expand => 1,
759 text => "Server List", 990 text => "Server List",
760 other => $METASERVER, 991 other => $METASERVER,
761 tooltip => "Show a list of available crossfire servers", 992 tooltip => "Show a list of available crossfire servers",
762 on_activate => sub { $METASERVER->toggle_visibility }, 993 on_activate => sub { $METASERVER->toggle_visibility },
994 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
763 ); 995 );
764 } 996 }
765 997
766 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 998 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
767 $table->add (1, 4, new CFClient::UI::Entry 999 $table->add (1, 4, new CFClient::UI::Entry
… …
834 $CONN ? stop_game 1066 $CONN ? stop_game
835 : start_game; 1067 : start_game;
836 }, 1068 },
837 ); 1069 );
838 1070
839 $dialog 1071 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1073 text => $CFG->{say_command},
1074 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1075 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077 on_changed => sub {
1078 my ($self, $value) = @_;
1079 $CFG->{say_command} = $value;
1080 }
1081 );
1082
1083 $vbox->add (new CFClient::UI::Label
1084 text => "Server Info",
1085 fontsize => 1.2,
1086 padding_y => 8,
1087 fg => [1, 1, 0, 1],
1088 );
1089
1090 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1091
1092 $vbox
840} 1093}
841 1094
842sub message_window { 1095sub message_window {
843 my $window = new CFClient::UI::FancyFrame 1096 my $window = new CFClient::UI::FancyFrame
844 name => "message_window", 1097 name => "message_window",
845 title => "Messages", 1098 title => "Messages",
846 border_bg => [1, 1, 1, 1], 1099 border_bg => [1, 1, 1, 1],
847 bg => [0, 0, 0, 0.75], 1100 bg => [0, 0, 0, 0.75],
848 x => "max", 1101 x => "max",
849 y => 0, 1102 y => 0,
850 force_w => $::WIDTH / 3, 1103 force_w => $::WIDTH * 0.4,
851 force_h => $::HEIGHT / 5, 1104 force_h => $::HEIGHT * 0.5,
852 child => (my $vbox = new CFClient::UI::VBox); 1105 child => (my $vbox = new CFClient::UI::VBox);
853 1106
854 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
855 1108
856 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
… …
870 }, 1123 },
871 on_activate => sub { 1124 on_activate => sub {
872 my ($input, $text) = @_; 1125 my ($input, $text) = @_;
873 $input->set_text (''); 1126 $input->set_text ('');
874 1127
875 if ($text =~ /^\/bind\s+(.*)$/) {
876 CFClient::Binder::open_binding_dialog (sub {
877 my ($mod, $sym) = @_;
878 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
879 });
880 } elsif ($text =~ /^\/(.*)/) { 1128 if ($text =~ /^\/(.*)/) {
881 $::CONN->user_send ($1); 1129 $::CONN->user_send ($1);
882 } else { 1130 } else {
883 my $say_cmd = $::CFG->{say_command} || 'say'; 1131 my $say_cmd = $::CFG->{say_command} || 'say';
884 $::CONN->user_send ("$say_cmd $text"); 1132 $::CONN->user_send ("$say_cmd $text");
885 } 1133 }
… …
904sub open_quit_dialog { 1152sub open_quit_dialog {
905 unless ($QUIT_DIALOG) { 1153 unless ($QUIT_DIALOG) {
906 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
907 x => "center", 1155 x => "center",
908 y => "center", 1156 y => "center",
1157 z => 50,
909 title => "Really Quit?", 1158 title => "Really Quit?",
910 ; 1159 ;
911 1160
912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
913 1162
… …
930 } 1179 }
931 1180
932 $QUIT_DIALOG->show; 1181 $QUIT_DIALOG->show;
933} 1182}
934 1183
1184sub autopickup_setup {
1185 my $table = new CFClient::UI::Table;
1186
1187 for (
1188 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG],
1193 ],
1194 ["Weapons", 0, 6,
1195 ["All weapons" => PICKUP_ALLWEAPON],
1196 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1197 ["Bows" => PICKUP_BOW],
1198 ["Arrows" => PICKUP_ARROW],
1199 ],
1200 ["Armour", 0, 12,
1201 ["Helmets" => PICKUP_HELMET],
1202 ["Shields" => PICKUP_SHIELD],
1203 ["Body Armour" => PICKUP_ARMOUR],
1204 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK],
1207 ],
1208
1209 ["Readables", 2, 2,
1210 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ],
1214 ["Misc", 2, 7,
1215 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS],
1224 ],
1225 ["Weight/Value ratio", 2, 17]
1226 )
1227 {
1228 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230
1231 for (@bits) {
1232 ++$y;
1233
1234 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask,
1238 on_changed => sub {
1239 my ($box, $value) = @_;
1240
1241 if ($value) {
1242 $::CFG->{pickup} |= $mask;
1243 } else {
1244 $::CFG->{pickup} &= ~$mask;
1245 }
1246
1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN;
1249 });
1250 }
1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 1;
1270 });
1271
1272 $table
1273}
1274
935sub make_inventory_window { 1275sub inventory_window {
936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
937 x => "center", 1277 x => "center",
938 y => "center", 1278 y => "center",
939 force_w => $WIDTH * 9/10, 1279 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10, 1280 force_h => $HEIGHT * 9/10,
… …
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958 1298
959 $invwin 1299 $invwin
960} 1300}
961 1301
962sub make_spell_list { 1302sub spell_setup {
963 $SPELL_LIST = new CFClient::UI::SpellList 1303 new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967} 1304}
968 1305
969sub make_binding_window { 1306sub keyboard_setup {
970 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
971 1308
972 my $refresh; 1309 my $refresh;
973 $refresh = sub { 1310 $refresh = sub {
974 $binding_list->clear (); 1311 $binding_list->clear ();
… …
998 sub { 1335 sub {
999 my ($nmod, $nsym, $ncmds) = @_; 1336 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym}; 1337 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1338 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->(); 1339 $refresh->();
1340 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1003 $::BIND_WINDOW->show; 1341 $SETUP_DIALOG->show;
1004 }, 1342 },
1005 sub { 1343 sub {
1344 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1006 $::BIND_WINDOW->show; 1345 $SETUP_DIALOG->show;
1007 }); 1346 });
1008 $::BIND_EDITOR->show; 1347 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide; 1348 $SETUP_DIALOG->hide;
1010 }); 1349 });
1011 1350
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 } 1353 }
1015 } 1354 }
1016 }; 1355 };
1017 1356
1018 $BIND_WINDOW = new CFClient::UI::FancyFrame
1019 title => "Bindings",
1020 x => "center",
1021 y => "center",
1022 def_w => int $WIDTH * 9/10,
1023 def_h => int $HEIGHT * 9/10,
1024 on_visibility_change => sub {
1025 my ($self, $visible) = @_;
1026 $refresh->() if $visible;
1027 };
1028
1029 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1357 my $vb = new CFClient::UI::VBox;
1030 $vb->add ($binding_list); 1358 $vb->add ($binding_list);
1031 $vb->add (my $hb = new CFClient::UI::HBox); 1359 $vb->add (my $hb = new CFClient::UI::HBox);
1360
1032 $hb->add (new CFClient::UI::Button 1361 $hb->add (new CFClient::UI::Button
1033 text => "record new", 1362 text => "record new",
1034 expand => 1, 1363 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.", 1364 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub { 1365 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [], 1366 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub { 1367 sub {
1039 my ($mod, $sym, $cmds) = @_; 1368 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1369 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->(); 1370 $refresh->();
1042 $::BIND_WINDOW->show; 1371 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372 $SETUP_DIALOG->show;
1043 }, 1373 },
1044 sub { 1374 sub {
1045 $::BIND_WINDOW->show; 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1046 }); 1377 },
1047 $::BIND_WINDOW->hide; 1378 );
1379 $SETUP_DIALOG->hide;
1048 $::BIND_EDITOR->show; 1380 $::BIND_EDITOR->show;
1049 }, 1381 },
1050 ); 1382 );
1383
1051 $hb->add (new CFClient::UI::Button 1384 $hb->add (new CFClient::UI::Button
1052 text => "close", 1385 text => "close",
1053 tooltip => "Closes the binding window", 1386 tooltip => "Closes the binding window",
1054 expand => 1, 1387 expand => 1,
1055 on_activate => sub { 1388 on_activate => sub {
1056 $::BIND_WINDOW->hide; 1389 $SETUP_DIALOG->hide;
1057 } 1390 }
1058 ); 1391 );
1059 1392
1060 $refresh->(); 1393 $refresh->();
1061 $BIND_WINDOW
1062}
1063 1394
1395 $vb
1396}
1397
1064sub make_help_window { 1398sub help_window {
1065 my $win = new CFClient::UI::FancyFrame 1399 my $win = new CFClient::UI::FancyFrame
1066 x => 'center', 1400 x => 'center',
1067 y => 'center', 1401 y => 'center',
1402 z => 2,
1068 name => 'doc_browser', 1403 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8, 1404 force_w => int $WIDTH * 7/8,
1070 force_h => int $HEIGHT * 7/8, 1405 force_h => int $HEIGHT * 7/8,
1071 title => "Documentation"; 1406 title => "Documentation";
1072 1407
1073 $win->add (my $vbox = new CFClient::UI::VBox); 1408 $win->add (my $vbox = new CFClient::UI::VBox);
1074 1409
1075 $vbox->add (my $buttons = new CFClient::UI::HBox); 1410 $vbox->add (my $buttons = new CFClient::UI::HBox);
1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1411 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1412 expand => 1, fontsize => 0.8, padding_x => 4);
1077 1413
1078 for ( 1414 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415 $buttons->add (my $combo = new CFClient::UI::Combobox
1416 value => undef,
1417 options => [
1079 [intro => "Introduction"], 1418 [intro => "Introduction"],
1080 [manual => "Manual"], 1419 [manual => "Manual"],
1420 [skill_help => "Skills"],
1081 [command_help => "Commands"], 1421 [command_help => "Commands"],
1082 [skill_help => "Skills"], 1422 [dmcommand_help => "DM Commands"],
1083 ) { 1423 [COPYING => "License Terms"],
1084 my ($pod, $label) = @$_; 1424 ],
1425 on_changed => sub {
1426 my ($self, $pod) = @_;
1085 1427
1086 $buttons->add (new CFClient::UI::Button 1428 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1087 text => $label, 1429 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1088 on_activate => sub {
1089 my $parser = new Pod::POM;
1090 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1091 1430
1092 $viewer->clear; 1431 $viewer->clear;
1093 1432
1094 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1433 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095 for @{ CFClient::pod_to_pango_list $pom }; 1434 for @$pom;
1096 1435
1097 $viewer->set_offset (0); 1436 $viewer->set_offset (0);
1098 }, 1437 },
1438 on_visibility_change => sub {
1439 my ($self, $visible) = @_;
1440 return unless $visible;
1441 return if $self->{value};
1442 $self->set_value ("intro");
1443 },
1099 ); 1444 );
1100 }
1101
1102 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1103 1445
1104 $win 1446 $win
1105} 1447}
1106 1448
1107sub sdl_init { 1449sub sdl_init {
… …
1147 $DEBUG_STATUS->show; 1489 $DEBUG_STATUS->show;
1148 1490
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1491 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150 1492
1151 $STATUSBOX = new CFClient::UI::Statusbox; 1493 $STATUSBOX = new CFClient::UI::Statusbox;
1152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1494 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1153 1495
1154 (new CFClient::UI::Frame 1496 (new CFClient::UI::Frame
1155 bg => [0, 0, 0, 0.4], 1497 bg => [0, 0, 0, 0.4],
1156 force_x => 0, 1498 force_x => 0,
1157 force_y => "max", 1499 force_y => "max",
1158 child => $STATUSBOX, 1500 child => $STATUSBOX,
1159 )->show; 1501 )->show;
1160 1502
1161 CFClient::UI::FancyFrame->new ( 1503 CFClient::UI::FancyFrame->new (
1504 title => "Map",
1505 name => "mapmap",
1162 x => 0, 1506 x => 0,
1163 y => $FONTSIZE + 8, 1507 y => $FONTSIZE + 8,
1164 border_bg => [1, 1, 1, 192/255], 1508 border_bg => [1, 1, 1, 192/255],
1165 bg => [1, 1, 1, 0], 1509 bg => [1, 1, 1, 0],
1166 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1510 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1182 } 1526 }
1183 }); 1527 });
1184 $MAPWIDGET->show; 1528 $MAPWIDGET->show;
1185 $MAPWIDGET->focus_in; 1529 $MAPWIDGET->focus_in;
1186 1530
1187 $LOGVIEW = new CFClient::UI::TextView 1531 $LOGVIEW = new CFClient::UI::TextScroller
1188 expand => 1, 1532 expand => 1,
1189 font => $FONT_FIXED, 1533 font => $FONT_FIXED,
1190 fontsize => $::CFG->{log_fontsize}, 1534 fontsize => $::CFG->{log_fontsize},
1535 indent => -4,
1191 can_hover => 1, 1536 can_hover => 1,
1192 can_events => 1, 1537 can_events => 1,
1193 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1538 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1194 ; 1539 ;
1195 1540
1541 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1542 title => "Setup",
1543 name => "setup_dialog",
1544 x => 'center',
1545 y => 'center',
1546 z => 2,
1547 force_w => $::WIDTH * 0.6,
1548 force_h => $::HEIGHT * 0.6,
1549 ;
1550
1551 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553
1554 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555 "Configure the server to play on, your username, password and other server-related options.");
1556 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1561 "Configure the use of audio, sound effects and background music.");
1562 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563 "Lets you define, edit and delete bindings."
1564 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1565 . "with nothing set and the recording started. After doing the actions you "
1566 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567 . "After pressing the combo the binding will be saved automatically and the "
1568 . "binding editor closes");
1569 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1572 "Some debuggign options. Do not ask.");
1573
1196 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1574 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1197 1575
1198 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1576 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1199 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1577 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1200 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1578
1201 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1202 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1579 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1203 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1580 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1204 1581
1205 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1582 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1206 1583
1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1584 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1208 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1585 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1209 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1586 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1210 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1587 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1211 ."You can also hit the Tab-key to show/hide the Inventory."); 1588 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1212 1589
1213 $BUTTONBAR->add (new CFClient::UI::Button 1590 $BUTTONBAR->add (new CFClient::UI::Button
1214 text => "Save Config", 1591 text => "Save Config",
1215 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1592 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1216 on_activate => sub { 1593 on_activate => sub {
… …
1218 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1595 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1219 status "Configuration Saved"; 1596 status "Configuration Saved";
1220 }, 1597 },
1221 ); 1598 );
1222 1599
1223 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1600 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1224 tooltip => "View Documentation"); 1601 tooltip => "View Documentation");
1225
1226 $BUTTONBAR->add (new CFClient::UI::Flopper
1227 text => "Bindings",
1228 other => make_binding_window,
1229 tooltip =>
1230 "Lets you define, edit and delete bindings."
1231 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1232 ."with nothing set and the recording started. After doing the actions you "
1233 ."want to record press Insert and you will be asked to press a key-combo."
1234 ."After pressing the combo the binding will be saved automatically and the "
1235 ."binding editor closes");
1236
1237 $BUTTONBAR->add (new CFClient::UI::Flopper
1238 text => "Spells",
1239 other => make_spell_list,
1240 tooltip => "The spell list");
1241 1602
1242 $BUTTONBAR->add (new CFClient::UI::Button 1603 $BUTTONBAR->add (new CFClient::UI::Button
1243 text => "Quit", 1604 text => "Quit",
1244 tooltip => "Terminates the program", 1605 tooltip => "Terminates the program",
1245 on_activate => sub { 1606 on_activate => sub {
… …
1250 } 1611 }
1251 }, 1612 },
1252 ); 1613 );
1253 1614
1254 $BUTTONBAR->show; 1615 $BUTTONBAR->show;
1255 $SERVER_SETUP->show; 1616 $SETUP_DIALOG->show;
1256
1257 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1258 } 1617 }
1618
1619 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1259} 1620}
1260 1621
1261sub video_shutdown { 1622sub video_shutdown {
1262 undef $SDL_ACTIVE; 1623 undef $SDL_ACTIVE;
1263} 1624}
… …
1395}; 1756};
1396 1757
1397 CFClient::SDL_GL_SwapBuffers; 1758 CFClient::SDL_GL_SwapBuffers;
1398} 1759}
1399 1760
1400my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1761my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1401 $NOW = time; 1762 $NOW = time;
1402 1763
1403 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1764 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1404 for CFClient::SDL_PollEvent; 1765 for CFClient::SDL_PollEvent;
1405 1766
… …
1472############################################################################# 1833#############################################################################
1473 1834
1474$SIG{INT} = $SIG{TERM} = sub { exit }; 1835$SIG{INT} = $SIG{TERM} = sub { exit };
1475 1836
1476{ 1837{
1477 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1838 local $SIG{__DIE__} = sub {
1839 return unless defined $^S && !$^S;
1840 Carp::confess $_[1];#d#TODO: remove when stable
1841 CFClient::fatal $_[0];
1842 };
1478 1843
1479 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1844 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1480 CFClient::UI::set_layout ($::CFG->{layout}); 1845 CFClient::UI::set_layout ($::CFG->{layout});
1481 1846
1482 my %DEF_CFG = ( 1847 my %DEF_CFG = (
… …
1488 map_scale => 1, 1853 map_scale => 1,
1489 fow_enable => 1, 1854 fow_enable => 1,
1490 fow_intensity => 0.45, 1855 fow_intensity => 0.45,
1491 fow_smooth => 0, 1856 fow_smooth => 0,
1492 gui_fontsize => 1, 1857 gui_fontsize => 1,
1493 log_fontsize => 1, 1858 log_fontsize => 0.7,
1494 gauge_fontsize=> 1, 1859 gauge_fontsize=> 1,
1495 gauge_size => 0.35, 1860 gauge_size => 0.35,
1496 stat_fontsize => 1, 1861 stat_fontsize => 0.7,
1497 mapsize => 100, 1862 mapsize => 100,
1498 host => "crossfire.schmorp.de", 1863 host => "crossfire.schmorp.de",
1499 say_command => 'say', 1864 say_command => 'say',
1500 audio_enable => 1, 1865 audio_enable => 1,
1501 bgm_enable => 1, 1866 bgm_enable => 1,
1502 bgm_volume => 0.25, 1867 bgm_volume => 0.25,
1503 face_prefetch => 0, 1868 face_prefetch => 0,
1504 output_sync => 1, 1869 output_sync => 1,
1505 output_count => 1, 1870 output_count => 1,
1871 pickup => 0,
1506 ); 1872 );
1507 1873
1508 while (my ($k, $v) = each %DEF_CFG) { 1874 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k}; 1875 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 } 1876 }
… …
1557 video_init; 1923 video_init;
1558 audio_init; 1924 audio_init;
1559} 1925}
1560 1926
1561Event::loop; 1927Event::loop;
1928#CFClient::SDL_Quit;
1929#CFClient::_exit 0;
1562 1930
1563END { CFClient::SDL_Quit } 1931END { CFClient::SDL_Quit }
1564 1932
1565=head1 NAME 1933=head1 NAME
1566 1934

Diff Legend

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