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.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
… …
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;
177 368
178 return unless $CONN; 369 return unless $CONN;
179 370
180 status "connection closed"; 371 status "connection closed";
181 372
373 destroy_query_dialog $CONN;
182 $CONN->destroy; 374 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 375 $CONN = 0; # false, does not autovivify
184} 376}
185 377
186sub client_setup { 378sub 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); 379 my $vbox = new CFClient::UI::VBox;
193 380
194 $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]);
195 382
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 384 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
321 on_activate => sub { 508 on_activate => sub {
322 video_shutdown (); 509 video_shutdown ();
323 video_init (); 510 video_init ();
324 } 511 }
325 ); 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;
326 523
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
329 state => $CFG->{audio_enable}, 526 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.", 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.",
… …
361 audio_shutdown (); 558 audio_shutdown ();
362 audio_init (); 559 audio_init ();
363 } 560 }
364 ); 561 );
365 562
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $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} 564}
380 565
381sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
441 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
442 627
443 $win 628 $win
444} 629}
445 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
446 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
447sub make_stats_window { 659sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw = new CFClient::UI::FancyFrame
449 y => $HEIGHT * (2/8), 661 y => $HEIGHT * (2/8),
450 x => "max", 662 x => "max",
451 title => "Stats", 663 title => "Stats",
452 name => "stats_window"; 664 name => "stats_window";
… …
556 update_stats_window ({}); 768 update_stats_window ({});
557 769
558 $tgw 770 $tgw
559} 771}
560 772
561sub formsep { 773sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563} 775}
564 776
565sub update_stats_window { 777sub update_stats_window {
566 my ($stats) = @_; 778 my ($stats) = @_;
567 779
… …
662 874
663 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
664 876
665 $table->clear; 877 $table->clear;
666 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 );
667 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
668 $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[$_])
669 for 0 .. $#col; 891 for 0 .. $#col;
670 892
671 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
672 894
673 my $y = 0; 895 my $y = 0;
674 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) {
… …
691 913
692 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
693 915
694 $y++; 916 $y++;
695 917
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
697 (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 {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
699 $METASERVER->toggle_visibility; 924 $METASERVER->hide;
925 },
700 }), 926 ),
701 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
702 ]); 928 ]);
703 929
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
705 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)
706 for 0 .. $#$m; 938 for 0 .. $#$m;
707 } 939 }
708 } 940 }
709 }); 941 });
710} 942}
711 943
712sub metaserver_dialog { 944sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame 945 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List", 946 title => "Server List",
715 name => 'metaserver_dialog', 947 name => 'metaserver_dialog',
716 x => 'center', 948 x => 'center',
717 y => 'center', 949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 952 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 953 on_visibility_change => sub {
720 update_metaserver if $_[1]; 954 update_metaserver if $_[1];
721 }, 955 },
722 ; 956 ;
723 957
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
725 961
726 $dialog 962 $dialog
727} 963}
728 964
729sub server_setup { 965sub 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), 966 my $vbox = new CFClient::UI::VBox;
736 ;
737 967
738 $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]);
739 $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");
740 970
741 { 971 {
… …
758 expand => 1, 988 expand => 1,
759 text => "Server List", 989 text => "Server List",
760 other => $METASERVER, 990 other => $METASERVER,
761 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
762 on_activate => sub { $METASERVER->toggle_visibility }, 992 on_activate => sub { $METASERVER->toggle_visibility },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
763 ); 994 );
764 } 995 }
765 996
766 $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");
767 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
834 $CONN ? stop_game 1065 $CONN ? stop_game
835 : start_game; 1066 : start_game;
836 }, 1067 },
837 ); 1068 );
838 1069
839 $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
840} 1092}
841 1093
842sub message_window { 1094sub message_window {
843 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
844 name => "message_window", 1096 name => "message_window",
845 title => "Messages", 1097 title => "Messages",
846 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
847 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
848 x => "max", 1100 x => "max",
849 y => 0, 1101 y => 0,
850 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
851 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
852 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
853 1105
854 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
855 1107
856 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
870 }, 1122 },
871 on_activate => sub { 1123 on_activate => sub {
872 my ($input, $text) = @_; 1124 my ($input, $text) = @_;
873 $input->set_text (''); 1125 $input->set_text ('');
874 1126
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 =~ /^\/(.*)/) { 1127 if ($text =~ /^\/(.*)/) {
881 $::CONN->user_send ($1); 1128 $::CONN->user_send ($1);
882 } else { 1129 } else {
883 my $say_cmd = $::CFG->{say_command} || 'say'; 1130 my $say_cmd = $::CFG->{say_command} || 'say';
884 $::CONN->user_send ("$say_cmd $text"); 1131 $::CONN->user_send ("$say_cmd $text");
885 } 1132 }
… …
904sub open_quit_dialog { 1151sub open_quit_dialog {
905 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
906 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
907 x => "center", 1154 x => "center",
908 y => "center", 1155 y => "center",
1156 z => 50,
909 title => "Really Quit?", 1157 title => "Really Quit?",
910 ; 1158 ;
911 1159
912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
913 1161
… …
930 } 1178 }
931 1179
932 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
933} 1181}
934 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
935sub make_inventory_window { 1274sub inventory_window {
936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
937 x => "center", 1276 x => "center",
938 y => "center", 1277 y => "center",
939 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
… …
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958 1297
959 $invwin 1298 $invwin
960} 1299}
961 1300
962sub make_spell_list { 1301sub spell_setup {
963 $SPELL_LIST = new CFClient::UI::SpellList 1302 new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967} 1303}
968 1304
969sub make_binding_window { 1305sub keyboard_setup {
970 my $binding_list = new CFClient::UI::VBox; 1306 my $binding_list = new CFClient::UI::VBox;
971 1307
972 my $refresh; 1308 my $refresh;
973 $refresh = sub { 1309 $refresh = sub {
974 $binding_list->clear (); 1310 $binding_list->clear ();
… …
998 sub { 1334 sub {
999 my ($nmod, $nsym, $ncmds) = @_; 1335 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym}; 1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->(); 1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1003 $::BIND_WINDOW->show; 1340 $SETUP_DIALOG->show;
1004 }, 1341 },
1005 sub { 1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1006 $::BIND_WINDOW->show; 1344 $SETUP_DIALOG->show;
1007 }); 1345 });
1008 $::BIND_EDITOR->show; 1346 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide; 1347 $SETUP_DIALOG->hide;
1010 }); 1348 });
1011 1349
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 } 1352 }
1015 } 1353 }
1016 }; 1354 };
1017 1355
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); 1356 my $vb = new CFClient::UI::VBox;
1030 $vb->add ($binding_list); 1357 $vb->add ($binding_list);
1031 $vb->add (my $hb = new CFClient::UI::HBox); 1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359
1032 $hb->add (new CFClient::UI::Button 1360 $hb->add (new CFClient::UI::Button
1033 text => "record new", 1361 text => "record new",
1034 expand => 1, 1362 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.", 1363 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub { 1364 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [], 1365 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub { 1366 sub {
1039 my ($mod, $sym, $cmds) = @_; 1367 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->(); 1369 $refresh->();
1042 $::BIND_WINDOW->show; 1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show;
1043 }, 1372 },
1044 sub { 1373 sub {
1045 $::BIND_WINDOW->show; 1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1375 $SETUP_DIALOG->show;
1046 }); 1376 },
1047 $::BIND_WINDOW->hide; 1377 );
1378 $SETUP_DIALOG->hide;
1048 $::BIND_EDITOR->show; 1379 $::BIND_EDITOR->show;
1049 }, 1380 },
1050 ); 1381 );
1382
1051 $hb->add (new CFClient::UI::Button 1383 $hb->add (new CFClient::UI::Button
1052 text => "close", 1384 text => "close",
1053 tooltip => "Closes the binding window", 1385 tooltip => "Closes the binding window",
1054 expand => 1, 1386 expand => 1,
1055 on_activate => sub { 1387 on_activate => sub {
1056 $::BIND_WINDOW->hide; 1388 $SETUP_DIALOG->hide;
1057 } 1389 }
1058 ); 1390 );
1059 1391
1060 $refresh->(); 1392 $refresh->();
1061 $BIND_WINDOW
1062}
1063 1393
1394 $vb
1395}
1396
1064sub make_help_window { 1397sub help_window {
1065 my $win = new CFClient::UI::FancyFrame 1398 my $win = new CFClient::UI::FancyFrame
1066 x => 'center', 1399 x => 'center',
1067 y => 'center', 1400 y => 'center',
1401 z => 2,
1068 name => 'doc_browser', 1402 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8, 1403 force_w => int $WIDTH * 7/8,
1070 force_h => int $HEIGHT * 7/8, 1404 force_h => int $HEIGHT * 7/8,
1071 title => "Documentation"; 1405 title => "Documentation";
1072 1406
1073 $win->add (my $vbox = new CFClient::UI::VBox); 1407 $win->add (my $vbox = new CFClient::UI::VBox);
1074 1408
1075 $vbox->add (my $buttons = new CFClient::UI::HBox); 1409 $vbox->add (my $buttons = new CFClient::UI::HBox);
1076 $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);
1077 1412
1078 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 => [
1079 [intro => "Introduction"], 1417 [intro => "Introduction"],
1080 [manual => "Manual"], 1418 [manual => "Manual"],
1419 [skill_help => "Skills"],
1081 [command_help => "Commands"], 1420 [command_help => "Commands"],
1082 [skill_help => "Skills"], 1421 [dmcommand_help => "DM Commands"],
1083 ) { 1422 [COPYING => "License Terms"],
1084 my ($pod, $label) = @$_; 1423 ],
1424 on_changed => sub {
1425 my ($self, $pod) = @_;
1085 1426
1086 $buttons->add (new CFClient::UI::Button 1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1087 text => $label, 1428 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 1429
1092 $viewer->clear; 1430 $viewer->clear;
1093 1431
1094 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095 for @{ CFClient::pod_to_pango_list $pom }; 1433 for @$pom;
1096 1434
1097 $viewer->set_offset (0); 1435 $viewer->set_offset (0);
1098 }, 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 },
1099 ); 1443 );
1100 }
1101
1102 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1103 1444
1104 $win 1445 $win
1105} 1446}
1106 1447
1107sub sdl_init { 1448sub sdl_init {
… …
1147 $DEBUG_STATUS->show; 1488 $DEBUG_STATUS->show;
1148 1489
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150 1491
1151 $STATUSBOX = new CFClient::UI::Statusbox; 1492 $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]); 1493 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1153 1494
1154 (new CFClient::UI::Frame 1495 (new CFClient::UI::Frame
1155 bg => [0, 0, 0, 0.4], 1496 bg => [0, 0, 0, 0.4],
1156 force_x => 0, 1497 force_x => 0,
1157 force_y => "max", 1498 force_y => "max",
1158 child => $STATUSBOX, 1499 child => $STATUSBOX,
1159 )->show; 1500 )->show;
1160 1501
1161 CFClient::UI::FancyFrame->new ( 1502 CFClient::UI::FancyFrame->new (
1503 title => "Map",
1504 name => "mapmap",
1162 x => 0, 1505 x => 0,
1163 y => $FONTSIZE + 8, 1506 y => $FONTSIZE + 8,
1164 border_bg => [1, 1, 1, 192/255], 1507 border_bg => [1, 1, 1, 192/255],
1165 bg => [1, 1, 1, 0], 1508 bg => [1, 1, 1, 0],
1166 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1509 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1182 } 1525 }
1183 }); 1526 });
1184 $MAPWIDGET->show; 1527 $MAPWIDGET->show;
1185 $MAPWIDGET->focus_in; 1528 $MAPWIDGET->focus_in;
1186 1529
1187 $LOGVIEW = new CFClient::UI::TextView 1530 $LOGVIEW = new CFClient::UI::TextScroller
1188 expand => 1, 1531 expand => 1,
1189 font => $FONT_FIXED, 1532 font => $FONT_FIXED,
1190 fontsize => $::CFG->{log_fontsize}, 1533 fontsize => $::CFG->{log_fontsize},
1534 indent => -4,
1191 can_hover => 1, 1535 can_hover => 1,
1192 can_events => 1, 1536 can_events => 1,
1193 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.",
1194 ; 1538 ;
1195 1539
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 ;
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
1196 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1573 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1197 1574
1198 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1575 $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."); 1576 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, 1577
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, 1578 $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."); 1579 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1204 1580
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 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
1206 1582
1207 $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,
1208 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.");
1209 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1585 $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 :)." 1586 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."); 1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1212 1588
1213 $BUTTONBAR->add (new CFClient::UI::Button 1589 $BUTTONBAR->add (new CFClient::UI::Button
1214 text => "Save Config", 1590 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.", 1591 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 { 1592 on_activate => sub {
… …
1218 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1219 status "Configuration Saved"; 1595 status "Configuration Saved";
1220 }, 1596 },
1221 ); 1597 );
1222 1598
1223 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1599 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1224 tooltip => "View Documentation"); 1600 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 1601
1242 $BUTTONBAR->add (new CFClient::UI::Button 1602 $BUTTONBAR->add (new CFClient::UI::Button
1243 text => "Quit", 1603 text => "Quit",
1244 tooltip => "Terminates the program", 1604 tooltip => "Terminates the program",
1245 on_activate => sub { 1605 on_activate => sub {
… …
1250 } 1610 }
1251 }, 1611 },
1252 ); 1612 );
1253 1613
1254 $BUTTONBAR->show; 1614 $BUTTONBAR->show;
1255 $SERVER_SETUP->show; 1615 $SETUP_DIALOG->show;
1256
1257 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1258 } 1616 }
1617
1618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1259} 1619}
1260 1620
1261sub video_shutdown { 1621sub video_shutdown {
1262 undef $SDL_ACTIVE; 1622 undef $SDL_ACTIVE;
1263} 1623}
… …
1395}; 1755};
1396 1756
1397 CFClient::SDL_GL_SwapBuffers; 1757 CFClient::SDL_GL_SwapBuffers;
1398} 1758}
1399 1759
1400my $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 {
1401 $NOW = time; 1761 $NOW = time;
1402 1762
1403 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1763 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1404 for CFClient::SDL_PollEvent; 1764 for CFClient::SDL_PollEvent;
1405 1765
… …
1472############################################################################# 1832#############################################################################
1473 1833
1474$SIG{INT} = $SIG{TERM} = sub { exit }; 1834$SIG{INT} = $SIG{TERM} = sub { exit };
1475 1835
1476{ 1836{
1477 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 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 };
1478 1842
1479 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1480 CFClient::UI::set_layout ($::CFG->{layout}); 1844 CFClient::UI::set_layout ($::CFG->{layout});
1481 1845
1482 my %DEF_CFG = ( 1846 my %DEF_CFG = (
… …
1488 map_scale => 1, 1852 map_scale => 1,
1489 fow_enable => 1, 1853 fow_enable => 1,
1490 fow_intensity => 0.45, 1854 fow_intensity => 0.45,
1491 fow_smooth => 0, 1855 fow_smooth => 0,
1492 gui_fontsize => 1, 1856 gui_fontsize => 1,
1493 log_fontsize => 1, 1857 log_fontsize => 0.7,
1494 gauge_fontsize=> 1, 1858 gauge_fontsize=> 1,
1495 gauge_size => 0.35, 1859 gauge_size => 0.35,
1496 stat_fontsize => 1, 1860 stat_fontsize => 0.7,
1497 mapsize => 100, 1861 mapsize => 100,
1498 host => "crossfire.schmorp.de", 1862 host => "crossfire.schmorp.de",
1499 say_command => 'say', 1863 say_command => 'say',
1500 audio_enable => 1, 1864 audio_enable => 1,
1501 bgm_enable => 1, 1865 bgm_enable => 1,
1502 bgm_volume => 0.25, 1866 bgm_volume => 0.25,
1503 face_prefetch => 0, 1867 face_prefetch => 0,
1504 output_sync => 1, 1868 output_sync => 1,
1505 output_count => 1, 1869 output_count => 1,
1870 pickup => 0,
1506 ); 1871 );
1507 1872
1508 while (my ($k, $v) = each %DEF_CFG) { 1873 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k}; 1874 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 } 1875 }

Diff Legend

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