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.66 by elmex, Thu Jun 8 19:43:26 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;
88 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
89our $FLOORBOX; 98our $FLOORBOX;
90our $GAUGES; 99our $GAUGES;
91our $STATWIDS; 100our $STATWIDS;
92 101
93our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
104our $INV_WINDOW; 113our $INV_WINDOW;
105our $INV; 114our $INV;
106our $INVR; 115our $INVR;
107our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
108 117
109our $BIND_WINDOW;
110our $BIND_EDITOR; 118our $BIND_EDITOR;
111 119
112our $SPELL_LIST; 120our $PICKUP_CFG;
113 121
114sub status { 122sub status {
115 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
116} 124}
117 125
118sub debug { 126sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
120} 128}
121 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
309}
310
122sub start_game { 311sub start_game {
123 status "logging in..."; 312 status "logging in...";
124 313
125 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
127 316
128 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
129 318
130 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
131 320
… …
143 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW, 333 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
146 map => $MAP, 335 map => $MAP,
147 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
148 338
149 sound_play => sub { 339 sound_play => sub {
150 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
151 341
152 $SDL_MIXER 342 $SDL_MIXER
… …
169 } 359 }
170} 360}
171 361
172sub stop_game { 362sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
176 $LOGVIEW->hide;
177 367
178 return unless $CONN; 368 return unless $CONN;
179 369
180 status "connection closed"; 370 status "connection closed";
181 371
372 destroy_query_dialog $CONN;
182 $CONN->destroy; 373 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
184} 375}
185 376
186sub client_setup { 377sub 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); 378 my $vbox = new CFClient::UI::VBox;
193 379
194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
195 381
196 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $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); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
321 on_activate => sub { 507 on_activate => sub {
322 video_shutdown (); 508 video_shutdown ();
323 video_init (); 509 video_init ();
324 } 510 }
325 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
326 522
327 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
329 state => $CFG->{audio_enable}, 525 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.", 526 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 (); 557 audio_shutdown ();
362 audio_init (); 558 audio_init ();
363 } 559 }
364 ); 560 );
365 561
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $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} 563}
380 564
381sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
441 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
442 626
443 $win 627 $win
444} 628}
445 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
446 632
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
641
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643
644 for my $x (0..2) {
645 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry
648 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 );
651 }
652 }
653
654
655 $table
656}
657
447sub make_stats_window { 658sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
449 y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
450 x => "max", 661 x => "max",
451 title => "Stats", 662 title => "Stats",
452 name => "stats_window"; 663 name => "stats_window";
… …
556 update_stats_window ({}); 767 update_stats_window ({});
557 768
558 $tgw 769 $tgw
559} 770}
560 771
561sub formsep { 772sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563} 774}
564 775
565sub update_stats_window { 776sub update_stats_window {
566 my ($stats) = @_; 777 my ($stats) = @_;
567 778
… …
662 873
663 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
664 875
665 $table->clear; 876 $table->clear;
666 877
878 my @tip = (
879 "The current number of users logged in on the server.",
880 "The hostname of the server.",
881 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.",
884 );
667 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
668 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 886 $table->add ($_, 0, new CFClient::UI::Label
887 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_])
669 for 0 .. $#col; 890 for 0 .. $#col;
670 891
671 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
672 893
673 my $y = 0; 894 my $y = 0;
674 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
691 912
692 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
693 914
694 $y++; 915 $y++;
695 916
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
697 (new CFClient::UI::Button text => "Use", on_activate => sub { 918 (new CFClient::UI::Button
919 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
699 $METASERVER->toggle_visibility; 923 $METASERVER->hide;
924 },
700 }), 925 ),
701 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
702 ]); 927 ]);
703 928
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
705 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 930 ellipsise => 0,
931 align => $align[$_],
932 text => $m->[$_],
933 tooltip => $tip[$_],
934 can_hover => 1,
935 can_events => 1,
936 fontsize => 0.8)
706 for 0 .. $#$m; 937 for 0 .. $#$m;
707 } 938 }
708 } 939 }
709 }); 940 });
710} 941}
711 942
712sub metaserver_dialog { 943sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List", 945 title => "Server List",
715 name => 'metaserver_dialog', 946 name => 'metaserver_dialog',
716 x => 'center', 947 x => 'center',
717 y => 'center', 948 y => 'center',
949 z => 3,
950 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 952 on_visibility_change => sub {
720 update_metaserver if $_[1]; 953 update_metaserver if $_[1];
721 }, 954 },
722 ; 955 ;
723 956
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
725 960
726 $dialog 961 $dialog
727} 962}
728 963
729sub server_setup { 964sub 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), 965 my $vbox = new CFClient::UI::VBox;
736 ;
737 966
738 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 967 $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"); 968 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
740 969
741 { 970 {
… …
758 expand => 1, 987 expand => 1,
759 text => "Server List", 988 text => "Server List",
760 other => $METASERVER, 989 other => $METASERVER,
761 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
762 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
763 ); 993 );
764 } 994 }
765 995
766 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
767 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
834 $CONN ? stop_game 1064 $CONN ? stop_game
835 : start_game; 1065 : start_game;
836 }, 1066 },
837 ); 1067 );
838 1068
839 $dialog 1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1071 text => $CFG->{say_command},
1072 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. "
1073 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1074 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub {
1076 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value;
1078 }
1079 );
1080
1081 $vbox
840} 1082}
841 1083
842sub message_window { 1084sub message_window {
843 my $window = new CFClient::UI::FancyFrame 1085 my $window = new CFClient::UI::FancyFrame
844 name => "message_window", 1086 name => "message_window",
845 title => "Messages", 1087 title => "Messages",
846 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
847 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
848 x => "max", 1090 x => "max",
849 y => 0, 1091 y => 0,
850 force_w => $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
851 force_h => $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
852 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
853 1095
854 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
855 1097
856 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
870 }, 1112 },
871 on_activate => sub { 1113 on_activate => sub {
872 my ($input, $text) = @_; 1114 my ($input, $text) = @_;
873 $input->set_text (''); 1115 $input->set_text ('');
874 1116
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 =~ /^\/(.*)/) { 1117 if ($text =~ /^\/(.*)/) {
881 $::CONN->user_send ($1); 1118 $::CONN->user_send ($1);
882 } else { 1119 } else {
883 my $say_cmd = $::CFG->{say_command} || 'say'; 1120 my $say_cmd = $::CFG->{say_command} || 'say';
884 $::CONN->user_send ("$say_cmd $text"); 1121 $::CONN->user_send ("$say_cmd $text");
885 } 1122 }
… …
904sub open_quit_dialog { 1141sub open_quit_dialog {
905 unless ($QUIT_DIALOG) { 1142 unless ($QUIT_DIALOG) {
906 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame
907 x => "center", 1144 x => "center",
908 y => "center", 1145 y => "center",
1146 z => 50,
909 title => "Really Quit?", 1147 title => "Really Quit?",
910 ; 1148 ;
911 1149
912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
913 1151
… …
930 } 1168 }
931 1169
932 $QUIT_DIALOG->show; 1170 $QUIT_DIALOG->show;
933} 1171}
934 1172
1173sub autopickup_setup {
1174 my $table = new CFClient::UI::Table;
1175
1176 for (
1177 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG],
1182 ],
1183 ["Weapons", 0, 6,
1184 ["All weapons" => PICKUP_ALLWEAPON],
1185 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1186 ["Bows" => PICKUP_BOW],
1187 ["Arrows" => PICKUP_ARROW],
1188 ],
1189 ["Armour", 0, 12,
1190 ["Helmets" => PICKUP_HELMET],
1191 ["Shields" => PICKUP_SHIELD],
1192 ["Body Armour" => PICKUP_ARMOUR],
1193 ["Boots" => PICKUP_BOOTS],
1194 ["Gloves" => PICKUP_GLOVES],
1195 ["Cloaks" => PICKUP_CLOAK],
1196 ],
1197
1198 ["Readables", 2, 2,
1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1202 ],
1203 ["Misc", 2, 7,
1204 ["Food" => PICKUP_FOOD],
1205 ["Drinks" => PICKUP_DRINK],
1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1207 ["Keys" => PICKUP_KEY],
1208 ["Magical Items" => PICKUP_MAGICAL],
1209 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS],
1213 ],
1214 ["Weight/Value ratio", 2, 17]
1215 )
1216 {
1217 my ($title, $x, $y, @bits) = @$_;
1218 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1219
1220 for (@bits) {
1221 ++$y;
1222
1223 my $mask = $_->[1];
1224 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1225 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1226 state => $CFG->{pickup} & $mask,
1227 on_changed => sub {
1228 my ($box, $value) = @_;
1229
1230 if ($value) {
1231 $::CFG->{pickup} |= $mask;
1232 } else {
1233 $::CFG->{pickup} &= ~$mask;
1234 }
1235
1236 $::CONN->send_command ("pickup $::CFG->{pickup}")
1237 if defined $::CONN;
1238 });
1239 }
1240 }
1241
1242 $table->add (2, 18, new CFClient::UI::ValSlider
1243 range => [0, 0, 16, 1, 1],
1244 to_value => sub { ">= " . 5 * $_[0] },
1245 on_changed => sub {
1246 my ($slider, $value) = @_;
1247
1248 $::CFG->{pickup} &= ~0x7;
1249 $::CFG->{pickup} |= int $value
1250 if $value;
1251 1;
1252 });
1253 $table->add (3, 18, new CFClient::UI::Button
1254 text => "set",
1255 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN;
1258 1;
1259 });
1260
1261 $table
1262}
1263
935sub make_inventory_window { 1264sub inventory_window {
936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1265 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
937 x => "center", 1266 x => "center",
938 y => "center", 1267 y => "center",
939 force_w => $WIDTH * 9/10, 1268 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10, 1269 force_h => $HEIGHT * 9/10,
… …
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1286 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958 1287
959 $invwin 1288 $invwin
960} 1289}
961 1290
962sub make_spell_list { 1291sub spell_setup {
963 $SPELL_LIST = new CFClient::UI::SpellList 1292 new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967} 1293}
968 1294
969sub make_binding_window { 1295sub keyboard_setup {
970 my $binding_list = new CFClient::UI::VBox; 1296 my $binding_list = new CFClient::UI::VBox;
971 1297
972 my $refresh; 1298 my $refresh;
973 $refresh = sub { 1299 $refresh = sub {
974 $binding_list->clear (); 1300 $binding_list->clear ();
… …
998 sub { 1324 sub {
999 my ($nmod, $nsym, $ncmds) = @_; 1325 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1327 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->(); 1328 $refresh->();
1329 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1003 $::BIND_WINDOW->show; 1330 $SETUP_DIALOG->show;
1004 }, 1331 },
1005 sub { 1332 sub {
1333 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1006 $::BIND_WINDOW->show; 1334 $SETUP_DIALOG->show;
1007 }); 1335 });
1008 $::BIND_EDITOR->show; 1336 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide; 1337 $SETUP_DIALOG->hide;
1010 }); 1338 });
1011 1339
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1340 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1341 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 } 1342 }
1015 } 1343 }
1016 }; 1344 };
1017 1345
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); 1346 my $vb = new CFClient::UI::VBox;
1030 $vb->add ($binding_list); 1347 $vb->add ($binding_list);
1031 $vb->add (my $hb = new CFClient::UI::HBox); 1348 $vb->add (my $hb = new CFClient::UI::HBox);
1349
1032 $hb->add (new CFClient::UI::Button 1350 $hb->add (new CFClient::UI::Button
1033 text => "record new", 1351 text => "record new",
1034 expand => 1, 1352 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.", 1353 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub { 1354 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [], 1355 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub { 1356 sub {
1039 my ($mod, $sym, $cmds) = @_; 1357 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1358 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->(); 1359 $refresh->();
1042 $::BIND_WINDOW->show; 1360 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1361 $SETUP_DIALOG->show;
1043 }, 1362 },
1044 sub { 1363 sub {
1045 $::BIND_WINDOW->show; 1364 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1365 $SETUP_DIALOG->show;
1046 }); 1366 },
1047 $::BIND_WINDOW->hide; 1367 );
1368 $SETUP_DIALOG->hide;
1048 $::BIND_EDITOR->show; 1369 $::BIND_EDITOR->show;
1049 }, 1370 },
1050 ); 1371 );
1372
1051 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1052 text => "close", 1374 text => "close",
1053 tooltip => "Closes the binding window", 1375 tooltip => "Closes the binding window",
1054 expand => 1, 1376 expand => 1,
1055 on_activate => sub { 1377 on_activate => sub {
1056 $::BIND_WINDOW->hide; 1378 $SETUP_DIALOG->hide;
1057 } 1379 }
1058 ); 1380 );
1059 1381
1060 $refresh->(); 1382 $refresh->();
1061 $BIND_WINDOW
1062}
1063 1383
1384 $vb
1385}
1386
1064sub make_help_window { 1387sub help_window {
1065 my $win = new CFClient::UI::FancyFrame 1388 my $win = new CFClient::UI::FancyFrame
1066 x => 'center', 1389 x => 'center',
1067 y => 'center', 1390 y => 'center',
1391 z => 2,
1068 name => 'doc_browser', 1392 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8, 1393 force_w => int $WIDTH * 7/8,
1070 force_h => int $HEIGHT * 7/8, 1394 force_h => int $HEIGHT * 7/8,
1071 title => "Documentation"; 1395 title => "Documentation";
1072 1396
1073 $win->add (my $vbox = new CFClient::UI::VBox); 1397 $win->add (my $vbox = new CFClient::UI::VBox);
1074 1398
1075 $vbox->add (my $buttons = new CFClient::UI::HBox); 1399 $vbox->add (my $buttons = new CFClient::UI::HBox);
1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1400 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1401 expand => 1, fontsize => 0.8, padding_x => 4);
1077 1402
1078 for ( 1403 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1404 $buttons->add (my $combo = new CFClient::UI::Combobox
1405 value => undef,
1406 options => [
1079 [intro => "Introduction"], 1407 [intro => "Introduction"],
1080 [manual => "Manual"], 1408 [manual => "Manual"],
1409 [skill_help => "Skills"],
1081 [command_help => "Commands"], 1410 [command_help => "Commands"],
1082 [skill_help => "Skills"], 1411 [dmcommand_help => "DM Commands"],
1083 ) { 1412 [COPYING => "License Terms"],
1084 my ($pod, $label) = @$_; 1413 ],
1414 on_changed => sub {
1415 my ($self, $pod) = @_;
1085 1416
1086 $buttons->add (new CFClient::UI::Button 1417 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1087 text => $label, 1418 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 1419
1092 $viewer->clear; 1420 $viewer->clear;
1093 1421
1094 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1422 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095 for @{ CFClient::pod_to_pango_list $pom }; 1423 for @$pom;
1096 1424
1097 $viewer->set_offset (0); 1425 $viewer->set_offset (0);
1098 }, 1426 },
1427 on_visibility_change => sub {
1428 my ($self, $visible) = @_;
1429 return unless $visible;
1430 return if $self->{value};
1431 $self->set_value ("intro");
1432 },
1099 ); 1433 );
1100 }
1101
1102 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1103 1434
1104 $win 1435 $win
1105} 1436}
1106 1437
1107sub sdl_init { 1438sub sdl_init {
… …
1147 $DEBUG_STATUS->show; 1478 $DEBUG_STATUS->show;
1148 1479
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1480 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150 1481
1151 $STATUSBOX = new CFClient::UI::Statusbox; 1482 $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]); 1483 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1153 1484
1154 (new CFClient::UI::Frame 1485 (new CFClient::UI::Frame
1155 bg => [0, 0, 0, 0.4], 1486 bg => [0, 0, 0, 0.4],
1156 force_x => 0, 1487 force_x => 0,
1157 force_y => "max", 1488 force_y => "max",
1158 child => $STATUSBOX, 1489 child => $STATUSBOX,
1159 )->show; 1490 )->show;
1160 1491
1161 CFClient::UI::FancyFrame->new ( 1492 CFClient::UI::FancyFrame->new (
1493 title => "Map",
1494 name => "mapmap",
1162 x => 0, 1495 x => 0,
1163 y => $FONTSIZE + 8, 1496 y => $FONTSIZE + 8,
1164 border_bg => [1, 1, 1, 192/255], 1497 border_bg => [1, 1, 1, 192/255],
1165 bg => [1, 1, 1, 0], 1498 bg => [1, 1, 1, 0],
1166 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1499 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1182 } 1515 }
1183 }); 1516 });
1184 $MAPWIDGET->show; 1517 $MAPWIDGET->show;
1185 $MAPWIDGET->focus_in; 1518 $MAPWIDGET->focus_in;
1186 1519
1187 $LOGVIEW = new CFClient::UI::TextView 1520 $LOGVIEW = new CFClient::UI::TextScroller
1188 expand => 1, 1521 expand => 1,
1189 font => $FONT_FIXED, 1522 font => $FONT_FIXED,
1190 fontsize => $::CFG->{log_fontsize}, 1523 fontsize => $::CFG->{log_fontsize},
1524 indent => -4,
1191 can_hover => 1, 1525 can_hover => 1,
1192 can_events => 1, 1526 can_events => 1,
1193 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1527 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1194 ; 1528 ;
1195 1529
1530 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1531 title => "Setup",
1532 name => "setup_dialog",
1533 x => 'center',
1534 y => 'center',
1535 z => 2,
1536 force_w => $::WIDTH * 0.6,
1537 force_h => $::HEIGHT * 0.6,
1538 ;
1539
1540 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1541 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1542
1543 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1544 "Configure the server to play on, your username, password and other server-related options.");
1545 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1546 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1547 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1548 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1549 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1550 "Configure the use of audio, sound effects and background music.");
1551 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1552 "Lets you define, edit and delete bindings."
1553 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1554 . "with nothing set and the recording started. After doing the actions you "
1555 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1556 . "After pressing the combo the binding will be saved automatically and the "
1557 . "binding editor closes");
1558 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1559 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1560 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1561 "Some debuggign options. Do not ask.");
1562
1196 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1563 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1197 1564
1198 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1565 $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."); 1566 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, 1567
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, 1568 $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."); 1569 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1204 1570
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 1571 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 1572
1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1573 $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."); 1574 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, 1575 $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 :)." 1576 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."); 1577 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1212 1578
1213 $BUTTONBAR->add (new CFClient::UI::Button 1579 $BUTTONBAR->add (new CFClient::UI::Button
1214 text => "Save Config", 1580 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.", 1581 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 { 1582 on_activate => sub {
… …
1218 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1584 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1219 status "Configuration Saved"; 1585 status "Configuration Saved";
1220 }, 1586 },
1221 ); 1587 );
1222 1588
1223 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1589 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1224 tooltip => "View Documentation"); 1590 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 1591
1242 $BUTTONBAR->add (new CFClient::UI::Button 1592 $BUTTONBAR->add (new CFClient::UI::Button
1243 text => "Quit", 1593 text => "Quit",
1244 tooltip => "Terminates the program", 1594 tooltip => "Terminates the program",
1245 on_activate => sub { 1595 on_activate => sub {
… …
1250 } 1600 }
1251 }, 1601 },
1252 ); 1602 );
1253 1603
1254 $BUTTONBAR->show; 1604 $BUTTONBAR->show;
1255 $SERVER_SETUP->show; 1605 $SETUP_DIALOG->show;
1256
1257 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1258 } 1606 }
1607
1608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1259} 1609}
1260 1610
1261sub video_shutdown { 1611sub video_shutdown {
1262 undef $SDL_ACTIVE; 1612 undef $SDL_ACTIVE;
1263} 1613}
… …
1395}; 1745};
1396 1746
1397 CFClient::SDL_GL_SwapBuffers; 1747 CFClient::SDL_GL_SwapBuffers;
1398} 1748}
1399 1749
1400my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1750my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1401 $NOW = time; 1751 $NOW = time;
1402 1752
1403 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1753 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1404 for CFClient::SDL_PollEvent; 1754 for CFClient::SDL_PollEvent;
1405 1755
… …
1472############################################################################# 1822#############################################################################
1473 1823
1474$SIG{INT} = $SIG{TERM} = sub { exit }; 1824$SIG{INT} = $SIG{TERM} = sub { exit };
1475 1825
1476{ 1826{
1477 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1827 local $SIG{__DIE__} = sub {
1828 return unless defined $^S && !$^S;
1829 Carp::confess $_[1];#d#TODO: remove when stable
1830 CFClient::fatal $_[0];
1831 };
1478 1832
1479 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1833 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1480 CFClient::UI::set_layout ($::CFG->{layout}); 1834 CFClient::UI::set_layout ($::CFG->{layout});
1481 1835
1482 my %DEF_CFG = ( 1836 my %DEF_CFG = (
… …
1488 map_scale => 1, 1842 map_scale => 1,
1489 fow_enable => 1, 1843 fow_enable => 1,
1490 fow_intensity => 0.45, 1844 fow_intensity => 0.45,
1491 fow_smooth => 0, 1845 fow_smooth => 0,
1492 gui_fontsize => 1, 1846 gui_fontsize => 1,
1493 log_fontsize => 1, 1847 log_fontsize => 0.7,
1494 gauge_fontsize=> 1, 1848 gauge_fontsize=> 1,
1495 gauge_size => 0.35, 1849 gauge_size => 0.35,
1496 stat_fontsize => 1, 1850 stat_fontsize => 0.7,
1497 mapsize => 100, 1851 mapsize => 100,
1498 host => "crossfire.schmorp.de", 1852 host => "crossfire.schmorp.de",
1499 say_command => 'say', 1853 say_command => 'say',
1500 audio_enable => 1, 1854 audio_enable => 1,
1501 bgm_enable => 1, 1855 bgm_enable => 1,
1502 bgm_volume => 0.25, 1856 bgm_volume => 0.25,
1503 face_prefetch => 0, 1857 face_prefetch => 0,
1504 output_sync => 1, 1858 output_sync => 1,
1505 output_count => 1, 1859 output_count => 1,
1860 pickup => 0,
1506 ); 1861 );
1507 1862
1508 while (my ($k, $v) = each %DEF_CFG) { 1863 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k}; 1864 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 } 1865 }

Diff Legend

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