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.43 by elmex, Fri Jun 2 16:27:28 2006 UTC vs.
Revision 1.86 by root, Sun Jul 2 21:07:27 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
… …
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 49 CFClient::error $_[1];
47}; 50};
48 51
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 53
… …
82our $CONSOLE; 85our $CONSOLE;
83our $METASERVER; 86our $METASERVER;
84our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 88our $QUIT_DIALOG;
86our $HOST_ENTRY; 89our $HOST_ENTRY;
87our $SERVER_SETUP; 90our $PICKUP_ENABLE;
91our $SERVER_INFO;
88 92
93our $SETUP_DIALOG;
94our $SETUP_NOTEBOOK;
95our $SETUP_SERVER;
96our $SETUP_KEYBOARD;
97
98our $PL_NOTEBOOK;
99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
106our $MESSAGE_WINDOW;
89our $FLOORBOX; 107our $FLOORBOX;
90our $GAUGES; 108our $GAUGES;
91our $STATWIDS; 109our $STATWIDS;
92 110
93our $SDL_ACTIVE; 111our $SDL_ACTIVE;
… …
99 117
100our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 119our $STATUSBOX;
102our $DEBUG_STATUS; 120our $DEBUG_STATUS;
103 121
104our $INV_WINDOW;
105our $INV; 122our $INV;
106our $INVR; 123our $INVR;
107our $INV_RIGHT_HB; 124our $INV_RIGHT_HB;
108 125
109our $BIND_WINDOW;
110our $BIND_EDITOR; 126our $BIND_EDITOR;
127our $BIND_UPD_CB;
111 128
112our $SPELL_LIST;
113our $PICKUP_CFG; 129our $PICKUP_CFG;
114 130
115sub status { 131sub status {
116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
117} 133}
118 134
119sub debug { 135sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 136 $DEBUG_STATUS->set_text ($_[0]);
121} 137}
122 138
139sub destroy_query_dialog {
140 (delete $_[0]{query_dialog})->destroy
141 if $_[0]{query_dialog};
142}
143
144# server query dialog
145sub server_query {
146 my ($conn, $flags, $prompt) = @_;
147
148 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
149 x => "center",
150 y => "center",
151 title => "Server Query",
152 child => my $vbox = new CFClient::UI::VBox,
153 ;
154
155 my @dialog = my $label = new CFClient::UI::Label
156 max_w => $::WIDTH * 0.4,
157 ellipsise => 0,
158 text => $prompt;
159
160 if ($flags & CS_QUERY_YESNO) {
161 push @dialog, my $hbox = new CFClient::UI::HBox;
162
163 $hbox->add (new CFClient::UI::Button
164 text => "No",
165 on_activate => sub {
166 $conn->send ("reply n");
167 $dialog->destroy;
168 0
169 }
170 );
171 $hbox->add (new CFClient::UI::Button
172 text => "Yes",
173 on_activate => sub {
174 $conn->send ("reply y");
175 destroy_query_dialog $conn;
176 0
177 },
178 );
179
180 $dialog->grab_focus;
181
182 } elsif ($flags & CS_QUERY_SINGLECHAR) {
183 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
184
185 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
186 $MESSAGE_WINDOW->show;
187
188 unshift @dialog, new CFClient::UI::Label
189 max_w => $::WIDTH * 0.4,
190 ellipsise => 0,
191 markup => "\nOr use your keyboard:\n";
192
193 unshift @dialog, my $table = new CFClient::UI::Table;
194
195 $table->add (0, 0, new CFClient::UI::Button
196 text => "Next Race",
197 on_activate => sub {
198 $conn->send ("reply n");
199 destroy_query_dialog $conn;
200 0
201 },
202 );
203 $table->add (2, 0, new CFClient::UI::Button
204 text => "Accept",
205 on_activate => sub {
206 $conn->send ("reply d");
207 destroy_query_dialog $conn;
208 0
209 },
210 );
211
212 unshift @dialog, new CFClient::UI::Label
213 max_w => $::WIDTH * 0.4,
214 ellipsise => 0,
215 markup =>
216 "<big><b>Character Creation: Race</b></big>\n\n"
217 . "Look at the <b>Messages</b> window to see a description of this race "
218 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
219 . "and the center of the screen to see how this race looks like "
220 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
221 . "You can look at another race, or accept this race (you will come back to this race eventually, "
222 . "so you can take your time making this important choice."
223 ;
224
225 } elsif ($prompt =~ /roll new stats/) {
226 if (my $stat = delete $conn->{stat_change_with}) {
227 $conn->send ("reply $stat");
228 destroy_query_dialog $conn;
229 return;
230 }
231
232 $STATS_PAGE->show;
233 $MESSAGE_WINDOW->hide;
234
235 unshift @dialog, new CFClient::UI::Label
236 max_w => $::WIDTH * 0.4,
237 ellipsise => 0,
238 markup => "\nOr use your keyboard:\n";
239
240 unshift @dialog, my $table = new CFClient::UI::Table;
241
242 # left: re-roll
243 $table->add (0, 0, new CFClient::UI::Button
244 text => "Roll Again",
245 on_activate => sub {
246 $conn->send ("reply y");
247 destroy_query_dialog $conn;
248 0
249 },
250 );
251
252 # center: swap stats
253 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
254 value => $_,
255 options => [
256 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
257 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
258 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
259 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
260 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
261 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
262 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
263 ],
264 ), 1 .. 2;
265
266 $table->add (2, 0, new CFClient::UI::Button
267 text => "Swap Stats",
268 on_activate => sub {
269 $conn->{stat_change_with} = $sw2->{value};
270 $conn->send ("reply $sw1->{value}");
271 destroy_query_dialog $conn;
272 0
273 },
274 );
275 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
276
277 # right: accept
278 $table->add (4, 0, new CFClient::UI::Button
279 text => "Accept",
280 on_activate => sub {
281 $conn->send ("reply n");
282 $STATS_PAGE->hide;
283 destroy_query_dialog $conn;
284 0
285 },
286 );
287
288 unshift @dialog, new CFClient::UI::Label
289 max_w => $::WIDTH * 0.4,
290 ellipsise => 0,
291 markup =>
292 "<big><b>Character Creation: Stats</b></big>\n\n"
293 . "Look at the <b>Stats</b> window to see your basic stats "
294 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
295 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
296 . "Race selection will influence those values later on."
297 ;
298 }
299
300 push @dialog, my $entry = new CFClient::UI::Entry
301 on_changed => sub {
302 $conn->send ("reply $_[1]");
303 destroy_query_dialog $conn;
304 0
305 },
306 ;
307
308 $entry->grab_focus;
309
310 } else {
311 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
312
313 push @dialog, my $entry = new CFClient::UI::Entry
314 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
315 on_activate => sub {
316 $conn->send ("reply $_[1]");
317 destroy_query_dialog $conn;
318 0
319 },
320 ;
321
322 $entry->grab_focus;
323 }
324
325 $vbox->add (@dialog);
326 $dialog->show;
327}
328
123sub start_game { 329sub start_game {
124 status "logging in..."; 330 status "logging in...";
125 331
126 $LOGIN_BUTTON->set_text ("Logout"); 332 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 333 $SETUP_DIALOG->hide;
128 334
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 335 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 336
131 my ($host, $port) = split /:/, $CFG->{host}; 337 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
132 338
133 $MAP = new CFClient::Map $mapsize, $mapsize; 339 $MAP = new CFClient::Map $mapsize, $mapsize;
134 340
135 $CONN = eval { 341 $CONN = eval {
136 new CFClient::Protocol 342 new CFClient::Protocol
137 host => $host, 343 host => $host,
138 port => $port || 13327, 344 port => $port || 13327,
139 user => $CFG->{user}, 345 user => $CFG->{profile}{default}{user},
140 pass => $CFG->{password}, 346 pass => $CFG->{profile}{default}{password},
141 mapw => $mapsize, 347 mapw => $mapsize,
142 maph => $mapsize, 348 maph => $mapsize,
143 349
144 map_widget => $MAPWIDGET, 350 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 351 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 352 statusbox => $STATUSBOX,
147 map => $MAP, 353 map => $MAP,
148 mapmap => $MAPMAP, 354 mapmap => $MAPMAP,
355 query => \&server_query,
149 356
150 sound_play => sub { 357 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 358 my ($x, $y, $soundnum, $type) = @_;
152 359
153 $SDL_MIXER 360 $SDL_MIXER
… …
170 } 377 }
171} 378}
172 379
173sub stop_game { 380sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 381 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 382 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
383 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 384 $PL_WINDOW->hide;
177 $LOGVIEW->hide; 385 $SPELL_PAGE->clear_spells;
178 386
179 return unless $CONN; 387 return unless $CONN;
180 388
181 status "connection closed"; 389 status "connection closed";
182 390
391 destroy_query_dialog $CONN;
183 $CONN->destroy; 392 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 393 $CONN = 0; # false, does not autovivify
185}
186 394
187sub client_setup { 395 undef $MAP;
188 my $dialog = new CFClient::UI::FancyFrame 396}
189 x => 1, 397
190 y => $HEIGHT * (1/8), 398sub graphics_setup {
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 399 my $vbox = new CFClient::UI::VBox;
194 400
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 401 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 402
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 403 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 404 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
212 418
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 420 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fullscreen}, 421 state => $CFG->{fullscreen},
216 tooltip => "Bring the client into fullscreen mode.", 422 tooltip => "Bring the client into fullscreen mode.",
217 on_changed => sub { 423 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fullscreen} = $value;
220 }
221 ); 424 );
222 425
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 426 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 427 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fast}, 428 state => $CFG->{fast},
226 tooltip => "Lower the visual quality considerably to speed up rendering.", 429 tooltip => "Lower the visual quality considerably to speed up rendering.",
227 on_changed => sub { 430 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fast} = $value;
230 }
231 ); 431 );
232 432
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 433 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
234 $table->add (1, $row++, new CFClient::UI::Slider 434 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 435 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 436 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
237 on_changed => sub { 437 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{map_scale} = 2 ** $value;
240 }
241 ); 438 );
242 439
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 441 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_enable}, 442 state => $CFG->{fow_enable},
246 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 443 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
247 on_changed => sub { 444 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_enable} = $value;
250 }
251 ); 445 );
252 446
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 447 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
254 $table->add (1, $row++, new CFClient::UI::Slider 448 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 449 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
256 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 450 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
257 on_changed => sub { 451 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
258 my ($self, $value) = @_;
259 $CFG->{fow_intensity} = $value;
260 }
261 ); 452 );
262 453
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 454 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
264 $table->add (1, $row++, new CFClient::UI::CheckBox 455 $table->add (1, $row++, new CFClient::UI::CheckBox
265 state => $CFG->{fow_smooth}, 456 state => $CFG->{fow_smooth},
266 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 457 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
267 on_changed => sub { 458 on_changed => sub {
268 my ($self, $value) = @_; 459 my ($self, $value) = @_;
269 $CFG->{fow_smooth} = $value; 460 $CFG->{fow_smooth} = $value;
270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 461 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
462 0
271 } 463 }
272 ); 464 );
273 465
274 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
275 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
276 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
277 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 469 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 470 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
279 ); 471 );
280 472
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 475 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
284 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 476 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 477 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
286 ); 478 );
287 479
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
289 481
290 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 484 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
293 on_changed => sub { 485 on_changed => sub {
294 $CFG->{stat_fontsize} = $_[1]; 486 $CFG->{stat_fontsize} = $_[1];
295 &set_stats_window_fontsize; 487 &set_stats_window_fontsize;
488 0
296 } 489 }
297 ); 490 );
298 491
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
300 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 494 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
302 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
303 on_changed => sub { 496 on_changed => sub {
304 $CFG->{gauge_fontsize} = $_[1]; 497 $CFG->{gauge_fontsize} = $_[1];
305 &set_gauge_window_fontsize; 498 &set_gauge_window_fontsize;
499 0
306 } 500 }
307 ); 501 );
308 502
309 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 503 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
310 $table->add (1, $row++, new CFClient::UI::Slider 504 $table->add (1, $row++, new CFClient::UI::Slider
311 range => [$CFG->{gauge_size}, 0.2, 0.8], 505 range => [$CFG->{gauge_size}, 0.2, 0.8],
312 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 506 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
313 on_changed => sub { 507 on_changed => sub {
314 $CFG->{gauge_size} = $_[1]; 508 $CFG->{gauge_size} = $_[1];
315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 509 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
510 0
316 } 511 }
317 ); 512 );
318 513
319 $table->add (1, $row++, new CFClient::UI::Button 514 $table->add (1, $row++, new CFClient::UI::Button
320 expand => 1, align => 0, text => "Apply", 515 expand => 1, align => 0, text => "Apply",
321 tooltip => "Apply the video settings", 516 tooltip => "Apply the video settings",
322 on_activate => sub { 517 on_activate => sub {
323 video_shutdown (); 518 video_shutdown ();
324 video_init (); 519 video_init ();
520 0
325 } 521 }
326 ); 522 );
523
524 $vbox
525}
526
527sub audio_setup {
528 my $vbox = new CFClient::UI::VBox;
529
530 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
531
532 my $row = 0;
327 533
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 535 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 536 state => $CFG->{audio_enable},
331 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.", 537 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.",
332 on_changed => sub { 538 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
333 $CFG->{audio_enable} = $_[1];
334 }
335 ); 539 );
336# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 540# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
337# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 541# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
338# $CFG->{effects_volume} = $_[1]; 542# $CFG->{effects_volume} = $_[1];
339# }); 543# });
340 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 544 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
341 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 545 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
342 $hbox->add (new CFClient::UI::CheckBox 546 $hbox->add (new CFClient::UI::CheckBox
343 expand => 1, state => $CFG->{bgm_enable}, 547 expand => 1, state => $CFG->{bgm_enable},
344 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 548 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
345 on_changed => sub { 549 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
346 $CFG->{bgm_enable} = $_[1];
347 }
348 ); 550 );
349 $hbox->add (new CFClient::UI::Slider 551 $hbox->add (new CFClient::UI::Slider
350 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 552 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
351 tooltip => "The volume of the background music. Changes are instant.", 553 tooltip => "The volume of the background music. Changes are instant.",
352 on_changed => sub { 554 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
353 $CFG->{bgm_volume} = $_[1];
354 CFClient::MixMusic::volume $_[1] * 128;
355 }
356 ); 555 );
357 556
358 $table->add (1, $row++, new CFClient::UI::Button 557 $table->add (1, $row++, new CFClient::UI::Button
359 expand => 1, align => 0, text => "Apply", 558 expand => 1, align => 0, text => "Apply",
360 tooltip => "Apply the audio settings", 559 tooltip => "Apply the audio settings",
361 on_activate => sub { 560 on_activate => sub {
362 audio_shutdown (); 561 audio_shutdown ();
363 audio_init (); 562 audio_init ();
563 0
364 } 564 }
365 ); 565 );
366 566
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 567 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 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. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380} 568}
381 569
382sub set_stats_window_fontsize { 570sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) { 571 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize}); 572 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
442 &set_gauge_window_fontsize; 630 &set_gauge_window_fontsize;
443 631
444 $win 632 $win
445} 633}
446 634
635sub debug_setup {
636 my $table = new CFClient::UI::Table;
447 637
638 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
639 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
640 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
641 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
642 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
643 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
644 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
645 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
646
647 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
648
649 for my $x (0..2) {
650 for my $y (0 .. 2) {
651 $table->add ($x + 3, $y,
652 new CFClient::UI::Entry
653 text => $default_smooth[$x * 3 + $y],
654 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
655 );
656 }
657 }
658
659
660 $table
661}
662
448sub make_stats_window { 663sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 664 my $tgw =
450 y => $HEIGHT * (2/8), 665 new CFClient::UI::Window
451 x => "max", 666 child => my $vb = new CFClient::UI::VBox;
452 title => "Stats",
453 name => "stats_window";
454 667
455 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
456 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
457 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
458 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
459 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
460 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
… …
484 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
485 697
486 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 698 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
487 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 699 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
488 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 700 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
489 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 701 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
490 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 702 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
491 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 703 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
492 ) { 704 ) {
493 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 705 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
494 706
… …
513 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
514 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
515 pois => "<b>Poison</b> (resistance to getting poisoned)", 727 pois => "<b>Poison</b> (resistance to getting poisoned)",
516 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
517 deat => "<b>Death</b> (resistance against death spells)", 729 deat => "<b>Death</b> (resistance against death spells)",
518 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
519 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
520 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 732 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
521 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
522 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
523 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
540 ); 752 );
541 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
542 font => $FONT_FIXED, 754 font => $FONT_FIXED,
543 can_hover => 1, 755 can_hover => 1,
544 can_events => 1, 756 can_events => 1,
545 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
546 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_},
547 ); 759 );
548 760
549 $row++; 761 $row++;
550 if ($row % 6 == 0) { 762 if ($row % 6 == 0) {
… …
557 update_stats_window ({}); 769 update_stats_window ({});
558 770
559 $tgw 771 $tgw
560} 772}
561 773
562sub formsep { 774sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 776}
565 777
566sub update_stats_window { 778sub update_stats_window {
567 my ($stats) = @_; 779 my ($stats) = @_;
568 780
… …
598 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
599 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
600 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
601 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
602 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
603 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
604 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
605 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
606 818
607 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
608 820
609 # TODO: replace by CS_STAT_RES_xxx constants
610 my %tbl = ( 821 my %tbl = (
611 phys => 100, 822 phys => CS_STAT_RES_PHYS,
612 magic => 101, 823 magic => CS_STAT_RES_MAG,
613 fire => 102, 824 fire => CS_STAT_RES_FIRE,
614 elec => 103, 825 elec => CS_STAT_RES_ELEC,
615 cold => 104, 826 cold => CS_STAT_RES_COLD,
616 conf => 105, 827 conf => CS_STAT_RES_CONF,
617 acid => 106, 828 acid => CS_STAT_RES_ACID,
618 drain => 107, 829 drain => CS_STAT_RES_DRAIN,
619 ghit => 108, 830 ghit => CS_STAT_RES_GHOSTHIT,
620 pois => 109, 831 pois => CS_STAT_RES_POISON,
621 slow => 110, 832 slow => CS_STAT_RES_SLOW,
622 para => 111, 833 para => CS_STAT_RES_PARA,
623 tund => 112, 834 tund => CS_STAT_TURN_UNDEAD,
624 fear => 113, 835 fear => CS_STAT_RES_FEAR,
625 depl => 113, 836 depl => CS_STAT_RES_DEPLETE,
626 deat => 115, 837 deat => CS_STAT_RES_DEATH,
627 holyw => 116, 838 holyw => CS_STAT_RES_HOLYWORD,
628 blind => 117, 839 blind => CS_STAT_RES_BLIND,
629 ); 840 );
630 841
631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
632 for keys %tbl; 843 for keys %tbl;
633} 844}
634 845
635my $METASERVER_ATIME; 846my $METASERVER_ATIME;
636 847
637sub update_metaserver { 848sub update_metaserver {
849 my ($metaserver_dialog) = @_;
850
851 $METASERVER = $metaserver_dialog
852 if defined $metaserver_dialog;
853
638 return if $METASERVER_ATIME > time; 854 return if $METASERVER_ATIME > time;
639 $METASERVER_ATIME = time + 60; 855 $METASERVER_ATIME = time + 60;
640 856
641 my $table = $METASERVER->{table}; 857 my $table = $METASERVER->{table};
642 $table->clear; 858 $table->clear;
… …
663 879
664 utf8::decode $buf if utf8::valid $buf; 880 utf8::decode $buf if utf8::valid $buf;
665 881
666 $table->clear; 882 $table->clear;
667 883
884 my @tip = (
885 "The current number of users logged in on the server.",
886 "The hostname of the server.",
887 "The time this server has been running without being restarted.",
888 "The server software version - a '+' indicates a Crossfire+ server.",
889 "Short information about this server provided by its admins.",
890 );
668 my @col = qw(Use #Users Host Uptime Version Description); 891 my @col = qw(#Users Host Uptime Version Description);
669 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 892 $table->add ($_, 0, new CFClient::UI::Label
893 can_hover => 1, can_events => 1,
894 align => 0, fg => [1, 1, 0],
895 text => $col[$_], tooltip => $tip[$_])
670 for 0 .. $#col; 896 for 0 .. $#col;
671 897
672 my @align = qw(1 0 1 1 -1); 898 my @align = qw(1 0 1 1 -1);
673 899
674 my $y = 0; 900 my $y = 0;
675 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 901 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
692 918
693 $m = [$users, $host, $uptime, $version, $desc]; 919 $m = [$users, $host, $uptime, $version, $desc];
694 920
695 $y++; 921 $y++;
696 922
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 923 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (new CFClient::UI::Button text => "Use", on_activate => sub { 924 (new CFClient::UI::Button
925 text => "Use",
926 tooltip => "Put this server into the <b>Host:Port</b> field",
927 on_activate => sub {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 928 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
700 $METASERVER->toggle_visibility; 929 $METASERVER->hide;
930 0
931 },
701 }), 932 ),
702 (new CFClient::UI::Empty expand => 1), 933 (new CFClient::UI::Empty expand => 1),
703 ]); 934 ]);
704 935
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 936 $table->add ($_, $y, new CFClient::UI::Label
706 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 937 ellipsise => 0,
938 align => $align[$_],
939 text => $m->[$_],
940 tooltip => $tip[$_],
941 can_hover => 1,
942 can_events => 1,
943 fontsize => 0.8)
707 for 0 .. $#$m; 944 for 0 .. $#$m;
708 } 945 }
709 } 946 }
710 }); 947 });
711} 948}
712 949
713sub metaserver_dialog { 950sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox;
952 my $table = new CFClient::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
954
714 my $dialog = new CFClient::UI::FancyFrame 955 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 956 title => "Server List",
716 name => 'metaserver_dialog', 957 name => 'metaserver_dialog',
717 x => 'center', 958 x => 'center',
718 y => 'center', 959 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox), 960 z => 3,
961 force_h => $::HEIGHT * 0.4,
962 child => $vbox,
963 has_close_button => 1,
964 table => $table,
720 on_visibility_change => sub { 965 on_visibility_change => sub {
721 update_metaserver if $_[1]; 966 update_metaserver ($_[0]) if $_[1];
967 0
722 }, 968 },
723 ; 969 ;
724 970
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog 971 $dialog
728} 972}
729 973
730sub server_setup { 974sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 975 my $vbox = new CFClient::UI::VBox;
737 ;
738 976
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 977 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 978 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 979
742 { 980 {
743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 981 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
744 982
745 $vbox->add ( 983 $vbox->add (
746 $HOST_ENTRY = new CFClient::UI::Entry 984 $HOST_ENTRY = new CFClient::UI::Entry
747 expand => 1, 985 expand => 1,
748 text => $CFG->{host}, 986 text => $CFG->{profile}{default}{host},
749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 987 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
750 on_changed => sub { 988 on_changed => sub {
751 my ($self, $value) = @_; 989 my ($self, $value) = @_;
752 $CFG->{host} = $value; 990 $CFG->{profile}{default}{host} = $value;
991 0
753 } 992 }
754 ); 993 );
755
756 $METASERVER = metaserver_dialog;
757 994
758 $vbox->add (new CFClient::UI::Button 995 $vbox->add (new CFClient::UI::Button
759 expand => 1, 996 expand => 1,
760 text => "Server List", 997 text => "Server List",
761 other => $METASERVER, 998 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 999 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 1000 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1001 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
764 ); 1002 );
765 } 1003 }
766 1004
767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1005 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
768 $table->add (1, 4, new CFClient::UI::Entry 1006 $table->add (1, 4, new CFClient::UI::Entry
769 text => $CFG->{user}, 1007 text => $CFG->{profile}{default}{user},
770 tooltip => "The name of your character on the server", 1008 tooltip => "The name of your character on the server",
771 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
772 my ($self, $value) = @_;
773 $CFG->{user} = $value;
774 }
775 ); 1010 );
776 1011
777 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1012 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
778 $table->add (1, 5, new CFClient::UI::Entry 1013 $table->add (1, 5, new CFClient::UI::Entry
779 text => $CFG->{password}, 1014 text => $CFG->{profile}{default}{password},
780 hidden => 1, 1015 hidden => 1,
781 tooltip => "The password for your character", 1016 tooltip => "The password for your character",
782 on_changed => sub { 1017 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
783 my ($self, $value) = @_;
784 $CFG->{password} = $value;
785 }
786 ); 1018 );
787 1019
788 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1020 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
789 $table->add (1, 7, new CFClient::UI::Slider 1021 $table->add (1, 7, new CFClient::UI::Slider
790 force_w => 100, 1022 force_w => 100,
791 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1023 range => [$CFG->{mapsize}, 10, 100, 0, 1],
792 tooltip => "This is the size of the portion of the map update the server sends you. " 1024 tooltip => "This is the size of the portion of the map update the server sends you. "
793 . "If you set this to a high value you will be able to see further, " 1025 . "If you set this to a high value you will be able to see further, "
794 . "but you also increase bandwidth requirements and latency. " 1026 . "but you also increase bandwidth requirements and latency. "
795 . "This option is only used once at log-in.", 1027 . "This option is only used once at log-in.",
796 on_changed => sub { 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
797 my ($self, $value) = @_;
798
799 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
800 },
801 ); 1029 );
802 1030
803 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1031 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
804 $table->add (1, 8, new CFClient::UI::CheckBox 1032 $table->add (1, 8, new CFClient::UI::CheckBox
805 state => $CFG->{face_prefetch}, 1033 state => $CFG->{face_prefetch},
… …
808 . "This might increase or create lag, but increases the chances " 1036 . "This might increase or create lag, but increases the chances "
809 . "of faces being ready for display when you encounter them. " 1037 . "of faces being ready for display when you encounter them. "
810 . "It also uses up server bandwidth on every connect, " 1038 . "It also uses up server bandwidth on every connect, "
811 . "so only set it if you really need to prefetch images. " 1039 . "so only set it if you really need to prefetch images. "
812 . "This option can be set and unset any time.", 1040 . "This option can be set and unset any time.",
813 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1041 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
814 ); 1042 );
815 1043
816 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1044 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
817 $table->add (1, 9, new CFClient::UI::Entry 1045 $table->add (1, 9, new CFClient::UI::Entry
818 text => $CFG->{output_count}, 1046 text => $CFG->{output_count},
819 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1047 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
820 on_changed => sub { $CFG->{output_count} = $_[1] }, 1048 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
821 ); 1049 );
822 1050
823 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1051 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
824 $table->add (1, 10, new CFClient::UI::Entry 1052 $table->add (1, 10, new CFClient::UI::Entry
825 text => $CFG->{output_sync}, 1053 text => $CFG->{output_sync},
826 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1054 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
827 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1055 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
828 ); 1056 );
829 1057
830 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1058 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
831 expand => 1, 1059 expand => 1,
832 align => 0, 1060 align => 0,
833 text => "Login", 1061 text => "Login",
834 on_activate => sub { 1062 on_activate => sub {
835 $CONN ? stop_game 1063 $CONN ? stop_game
836 : start_game; 1064 : start_game;
1065 0
837 }, 1066 },
838 ); 1067 );
839 1068
840 $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 0
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
841} 1092}
842 1093
843sub message_window { 1094sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1096 name => "message_window",
846 title => "Messages", 1097 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
849 x => "max", 1100 x => "max",
850 y => 0, 1101 y => 0,
851 force_w => $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox),
1105 has_close_button => 1;
854 1106
855 $vbox->add ($LOGVIEW); 1107 $vbox->add ($LOGVIEW);
856 1108
857 $vbox->add (my $input = new CFClient::UI::Entry 1109 $vbox->add (my $input = new CFClient::UI::Entry
858 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1110 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
866 1118
867 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1119 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
868 $input->{refocus_map} = 1; 1120 $input->{refocus_map} = 1;
869 } 1121 }
870 delete $input->{auto_activated}; 1122 delete $input->{auto_activated};
1123
1124 0
871 }, 1125 },
872 on_activate => sub { 1126 on_activate => sub {
873 my ($input, $text) = @_; 1127 my ($input, $text) = @_;
874 $input->set_text (''); 1128 $input->set_text ('');
875 1129
876 if ($text =~ /^\/bind\s+(.*)$/) {
877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
881 } elsif ($text =~ /^\/(.*)/) { 1130 if ($text =~ /^\/(.*)/) {
882 $::CONN->user_send ($1); 1131 $::CONN->user_send ($1);
883 } else { 1132 } else {
884 my $say_cmd = $::CFG->{say_command} || 'say'; 1133 my $say_cmd = $::CFG->{say_command} || 'say';
885 $::CONN->user_send ("$say_cmd $text"); 1134 $::CONN->user_send ("$say_cmd $text");
886 } 1135 }
887 if ($input->{refocus_map}) { 1136 if ($input->{refocus_map}) {
888 delete $input->{refocus_map}; 1137 delete $input->{refocus_map};
889 $MAPWIDGET->focus_in 1138 $MAPWIDGET->focus_in
890 } 1139 }
1140
1141 0
891 }, 1142 },
892 on_escape => sub { 1143 on_escape => sub {
893 $MAPWIDGET->focus_in 1144 $MAPWIDGET->grab_focus;
1145
1146 0
894 }, 1147 },
895 ); 1148 );
896 1149
897 $CONSOLE = { 1150 $CONSOLE = {
898 window => $window, 1151 window => $window,
… …
905sub open_quit_dialog { 1158sub open_quit_dialog {
906 unless ($QUIT_DIALOG) { 1159 unless ($QUIT_DIALOG) {
907 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1160 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center", 1161 x => "center",
909 y => "center", 1162 y => "center",
1163 z => 50,
910 title => "Really Quit?", 1164 title => "Really Quit?",
911 ; 1165 ;
912 1166
913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1167 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
914 1168
… …
919 ); 1173 );
920 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1174 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
921 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFClient::UI::Button
922 text => "Ok", 1176 text => "Ok",
923 expand => 1, 1177 expand => 1,
924 on_activate => sub { $QUIT_DIALOG->hide }, 1178 on_activate => sub { $QUIT_DIALOG->hide; 0 },
925 ); 1179 );
926 $hb->add (new CFClient::UI::Button 1180 $hb->add (new CFClient::UI::Button
927 text => "Quit anyway", 1181 text => "Quit anyway",
928 expand => 1, 1182 expand => 1,
929 on_activate => sub { exit }, 1183 on_activate => sub { exit },
… …
931 } 1185 }
932 1186
933 $QUIT_DIALOG->show; 1187 $QUIT_DIALOG->show;
934} 1188}
935 1189
936sub make_pickup_cfg_window { 1190sub autopickup_setup {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 x => "center",
939 y => "center",
940 force_w => $WIDTH * 3/10,
941 force_h => $HEIGHT * 9/10;
942
943 my $tbl = new CFClient::UI::Table; 1191 my $table = new CFClient::UI::Table;
944 my $tblrow = 0;
945 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl);
946 1192
947 for ( 1193 for (
948 ["General"], 1194 ["General", 0, 0,
949 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
950 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
951 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1197 ["Stop before pickup" => PICKUP_STOP],
952 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1198 ["Debug autopickup" => PICKUP_DEBUG],
1199 ],
953 ["Weapons"], 1200 ["Weapons", 0, 6,
954 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1201 ["All weapons" => PICKUP_ALLWEAPON],
955 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1202 ["Missile weapons" => PICKUP_MISSILEWEAPON],
956 ["Bows" => CFClient::Pickup::PU_BOW], 1203 ["Bows" => PICKUP_BOW],
957 ["Arrows" => CFClient::Pickup::PU_ARROW], 1204 ["Arrows" => PICKUP_ARROW],
1205 ],
958 ["Armour"], 1206 ["Armour", 0, 12,
959 ["Helmets" => CFClient::Pickup::PU_HELMET], 1207 ["Helmets" => PICKUP_HELMET],
960 ["Shields" => CFClient::Pickup::PU_SHIELD], 1208 ["Shields" => PICKUP_SHIELD],
961 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1209 ["Body Armour" => PICKUP_ARMOUR],
962 ["Boots" => CFClient::Pickup::PU_BOOTS], 1210 ["Boots" => PICKUP_BOOTS],
963 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1211 ["Gloves" => PICKUP_GLOVES],
964 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1212 ["Cloaks" => PICKUP_CLOAK],
1213 ],
1214
965 ["Readables"], 1215 ["Readables", 2, 2,
966 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1216 ["Spellbooks" => PICKUP_SPELLBOOK],
967 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1217 ["Skillscrolls" => PICKUP_SKILLSCROLL],
968 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1218 ["Normal Books/Scrolls" => PICKUP_READABLES],
1219 ],
969 ["Misc"], 1220 ["Misc", 2, 7,
970 ["Food" => CFClient::Pickup::PU_FOOD], 1221 ["Food" => PICKUP_FOOD],
971 ["Drinks" => CFClient::Pickup::PU_DRINK], 1222 ["Drinks" => PICKUP_DRINK],
972 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1223 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
973 ["Keys" => CFClient::Pickup::PU_KEY], 1224 ["Keys" => PICKUP_KEY],
974 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1225 ["Magical Items" => PICKUP_MAGICAL],
975 ["Potions" => CFClient::Pickup::PU_POTION], 1226 ["Potions" => PICKUP_POTION],
976 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1227 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
977 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1228 ["Ignore cursed" => PICKUP_NOT_CURSED],
978 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1229 ["Jewelery" => PICKUP_JEWELS],
1230 ],
1231 ["Weight/Value ratio", 2, 17]
979 ) 1232 )
980 { 1233 {
981 unless (defined $_->[1]) { 1234 my ($title, $x, $y, @bits) = @$_;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0); 1235 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } else { 1236
1237 for (@bits) {
1238 ++$y;
1239
984 my $mask = $_->[1]; 1240 my $mask = $_->[1];
985 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1); 1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
988 on_changed => sub { 1244 on_changed => sub {
989 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1246
990 if ($value) { 1247 if ($value) {
991 $CFG->{pickup} |= $mask; 1248 $::CFG->{pickup} |= $mask;
992 } else { 1249 } else {
993 $CFG->{pickup} = $CFG->{pickup} & ~$mask; 1250 $::CFG->{pickup} &= ~$mask;
994 } 1251 }
1252
995 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup}); 1253 $::CONN->send_command ("pickup $::CFG->{pickup}")
1254 if defined $::CONN;
1255
1256 0
996 }); 1257 });
1258
1259 ${$_->[2]} = $checkbox if $_->[2];
997 } 1260 }
998 } 1261 }
999 1262
1000 $PICKUP_CFG 1263 $table->add (2, 18, new CFClient::UI::ValSlider
1001} 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99",
1266 to_value => sub { ">= " . 5 * $_[0] },
1267 on_changed => sub {
1268 my ($slider, $value) = @_;
1002 1269
1270 $::CFG->{pickup} &= ~0xF;
1271 $::CFG->{pickup} |= int $value
1272 if $value;
1273 1;
1274 });
1275
1276 $table->add (3, 18, new CFClient::UI::Button
1277 text => "set",
1278 on_activate => sub {
1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1280 if defined $::CONN;
1281 0
1282 });
1283
1284 $table
1285}
1286
1003sub make_inventory_window { 1287sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1;
1289
1290 $hb->add (my $vb1 = new CFClient::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1292 $vb1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1319 x => "center",
1006 y => "center", 1320 y => "center",
1007 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1009 title => "Inventory", 1323 title => "Player",
1324 has_close_button => 1
1010 ; 1325 ;
1011 1326
1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1327 my $ntb =
1328 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook
1330 expand => 1,
1331 debug => 1,
1332 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1333 ;
1013 1334
1014 $hb->add (my $vb1 = new CFClient::UI::VBox); 1335 $ntb->add (
1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1017 1338 );
1018 $hb->add (my $vb2 = new CFClient::UI::VBox); 1339 $ntb->add (
1019
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1021
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028}
1029
1030sub make_spell_list {
1031 $SPELL_LIST = new CFClient::UI::SpellList 1340 Spells => $SPELL_PAGE = new CFClient::UI::SpellList,
1032 force_w => $WIDTH * (9/10), 1341 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1033 force_h => $HEIGHT * (9/10); 1342 );
1034 $SPELL_LIST 1343 $ntb->add (
1035} 1344 Inventory => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1346 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 );
1036 1348
1037sub make_binding_window { 1349
1350 $plwin->add ($ntb);
1351 $plwin
1352}
1353
1354sub update_bindings {
1355 $BIND_UPD_CB->() if $BIND_UPD_CB;
1356}
1357
1358sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1359 my $binding_list = new CFClient::UI::VBox;
1039 1360
1040 my $refresh; 1361 my $refresh;
1041 $refresh = sub { 1362 $refresh = $BIND_UPD_CB = sub {
1042 $binding_list->clear (); 1363 $binding_list->clear ();
1043 1364
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1365 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1366 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1367 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1368 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1369
1049 my $lbl = join "; ", @$cmds; 1370 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1371 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1372 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1053 text => "delete", 1374 text => "delete",
1054 tooltip => "Deletes the binding", 1375 tooltip => "Deletes the binding",
1055 on_activate => sub { 1376 on_activate => sub {
1056 $binding_list->remove ($hb); 1377 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1378 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1379 0
1058 }); 1380 });
1059 1381
1060 $hb->add (new CFClient::UI::Button 1382 $hb->add (new CFClient::UI::Button
1061 text => "edit", 1383 text => "edit",
1062 tooltip => "Edits the binding", 1384 tooltip => "Edits the binding",
1063 on_activate => sub { 1385 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1386 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1387 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1066 sub { 1388 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1389 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1390 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1391 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1070 $refresh->(); 1392 $refresh->();
1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1071 $::BIND_WINDOW->show; 1394 $SETUP_DIALOG->show;
1072 }, 1395 },
1073 sub { 1396 sub {
1397 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $::BIND_WINDOW->show; 1398 $SETUP_DIALOG->show;
1075 }); 1399 });
1076 $::BIND_EDITOR->show; 1400 $::BIND_EDITOR->show;
1077 $::BIND_WINDOW->hide; 1401 $SETUP_DIALOG->hide;
1402 0
1078 }); 1403 });
1079 1404
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1405 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1406 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 } 1407 }
1083 } 1408 }
1084 }; 1409 };
1085 1410
1086 $BIND_WINDOW = new CFClient::UI::FancyFrame 1411 my $vb = new CFClient::UI::VBox;
1087 title => "Bindings",
1088 x => "center",
1089 y => "center",
1090 def_w => int $WIDTH * 9/10,
1091 def_h => int $HEIGHT * 9/10,
1092 on_visibility_change => sub {
1093 my ($self, $visible) = @_;
1094 $refresh->() if $visible;
1095 };
1096
1097 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1412 $vb->add (my $hb = new CFClient::UI::HBox);
1413 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1414 $hb->add (new CFClient::UI::CheckBox
1415 expand => 1,
1416 state => $CFG->{shift_fire_stop},
1417 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1418 on_changed => sub {
1419 my ($cbox, $value) = @_;
1420 $CFG->{shift_fire_stop} = $value;
1421 0
1422 });
1423
1098 $vb->add ($binding_list); 1424 $vb->add ($binding_list);
1099 $vb->add (my $hb = new CFClient::UI::HBox); 1425 $vb->add (my $hb = new CFClient::UI::HBox);
1426
1100 $hb->add (new CFClient::UI::Button 1427 $hb->add (new CFClient::UI::Button
1101 text => "record new", 1428 text => "record new",
1102 expand => 1, 1429 expand => 1,
1103 tooltip => "This button opens the binding editor with an empty binding.", 1430 tooltip => "This button opens the binding editor with an empty binding.",
1104 on_activate => sub { 1431 on_activate => sub {
1105 $::BIND_EDITOR->set_binding (undef, undef, [], 1432 $::BIND_EDITOR->set_binding (undef, undef, [],
1106 sub { 1433 sub {
1107 my ($mod, $sym, $cmds) = @_; 1434 my ($mod, $sym, $cmds) = @_;
1108 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1435 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1109 $refresh->(); 1436 $refresh->();
1110 $::BIND_WINDOW->show; 1437 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1438 $SETUP_DIALOG->show;
1111 }, 1439 },
1112 sub { 1440 sub {
1113 $::BIND_WINDOW->show; 1441 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1442 $SETUP_DIALOG->show;
1114 }); 1443 },
1115 $::BIND_WINDOW->hide; 1444 );
1445 $SETUP_DIALOG->hide;
1116 $::BIND_EDITOR->show; 1446 $::BIND_EDITOR->show;
1447 0
1117 }, 1448 },
1118 ); 1449 );
1450
1119 $hb->add (new CFClient::UI::Button 1451 $hb->add (new CFClient::UI::Button
1120 text => "close", 1452 text => "close",
1121 tooltip => "Closes the binding window", 1453 tooltip => "Closes the binding window",
1122 expand => 1, 1454 expand => 1,
1123 on_activate => sub { 1455 on_activate => sub {
1124 $::BIND_WINDOW->hide; 1456 $SETUP_DIALOG->hide;
1457 0
1125 } 1458 }
1126 ); 1459 );
1127 1460
1128 $refresh->(); 1461 $refresh->();
1129 $BIND_WINDOW
1130}
1131 1462
1463 $vb
1464}
1465
1132sub make_help_window { 1466sub help_window {
1133 my $win = new CFClient::UI::FancyFrame 1467 my $win = new CFClient::UI::FancyFrame
1134 x => 'center', 1468 x => 'center',
1135 y => 'center', 1469 y => 'center',
1470 z => 2,
1136 name => 'doc_browser', 1471 name => 'doc_browser',
1137 force_w => int $WIDTH * 7/8, 1472 force_w => int $WIDTH * 7/8,
1138 force_h => int $HEIGHT * 7/8, 1473 force_h => int $HEIGHT * 7/8,
1139 title => "Documentation"; 1474 title => "Documentation";
1140 1475
1141 $win->add (my $vbox = new CFClient::UI::VBox); 1476 $win->add (my $vbox = new CFClient::UI::VBox);
1142 1477
1143 $vbox->add (my $buttons = new CFClient::UI::HBox); 1478 $vbox->add (my $buttons = new CFClient::UI::HBox);
1144 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1479 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1480 expand => 1, fontsize => 0.8, padding_x => 4);
1145 1481
1146 for ( 1482 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1483 $buttons->add (my $combo = new CFClient::UI::Combobox
1484 value => undef,
1485 options => [
1147 [intro => "Introduction"], 1486 [intro => "Introduction"],
1148 [manual => "Manual"], 1487 [manual => "Main Manual"],
1488 [skill_help => "Skill Reference"],
1489 [command_help => "Command Reference"],
1149 [command_help => "Commands"], 1490 [dmcommand_help => "DM Commands"],
1150 [skill_help => "Skills"], 1491 [COPYING => "License Terms"],
1151 ) { 1492 ],
1152 my ($pod, $label) = @$_; 1493 on_changed => sub {
1494 my ($self, $pod) = @_;
1153 1495
1154 $buttons->add (new CFClient::UI::Button 1496 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1155 text => $label, 1497 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1156 on_activate => sub {
1157 my $parser = new Pod::POM;
1158 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1159 1498
1160 $viewer->clear; 1499 $viewer->clear;
1500
1501# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1502# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1503# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1504# ]);#d#
1161 1505
1162 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1506 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1163 for @{ CFClient::pod_to_pango_list $pom }; 1507 for @$pom;
1164 1508
1165 $viewer->set_offset (0); 1509 $viewer->set_offset (0);
1510
1166 }, 1511 0
1512 },
1513 on_visibility_change => sub {
1514 my ($self, $visible) = @_;
1515 return unless $visible;
1516 return if $self->{value};
1517 $self->set_value ("intro");
1518 0
1519 },
1167 ); 1520 );
1168 }
1169
1170 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1171 1521
1172 $win 1522 $win
1173} 1523}
1174 1524
1175sub sdl_init { 1525sub sdl_init {
… …
1212 z => 100, 1562 z => 100,
1213 force_x => "max", 1563 force_x => "max",
1214 force_y => 0; 1564 force_y => 0;
1215 $DEBUG_STATUS->show; 1565 $DEBUG_STATUS->show;
1216 1566
1217 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1567 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1218 1568
1219 $STATUSBOX = new CFClient::UI::Statusbox; 1569 $STATUSBOX = new CFClient::UI::Statusbox;
1220 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1570 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1221 1571
1222 (new CFClient::UI::Frame 1572 (new CFClient::UI::Frame
1223 bg => [0, 0, 0, 0.4], 1573 bg => [0, 0, 0, 0.4],
1224 force_x => 0, 1574 force_x => 0,
1225 force_y => "max", 1575 force_y => "max",
1226 child => $STATUSBOX, 1576 child => $STATUSBOX,
1227 )->show; 1577 )->show;
1228 1578
1229 CFClient::UI::FancyFrame->new ( 1579 CFClient::UI::FancyFrame->new (
1230 title => "Mini Map", 1580 title => "Map",
1231 name => "mapmap", 1581 name => "mapmap",
1232 x => 0, 1582 x => 0,
1233 y => $FONTSIZE + 8, 1583 y => $FONTSIZE + 8,
1234 border_bg => [1, 1, 1, 192/255], 1584 border_bg => [1, 1, 1, 192/255],
1235 bg => [1, 1, 1, 0], 1585 bg => [1, 1, 1, 0],
… …
1242 $MAPWIDGET->connect (activate_console => sub { 1592 $MAPWIDGET->connect (activate_console => sub {
1243 my ($mapwidget, $preset) = @_; 1593 my ($mapwidget, $preset) = @_;
1244 1594
1245 if ($CONSOLE) { 1595 if ($CONSOLE) {
1246 $CONSOLE->{input}->{auto_activated} = 1; 1596 $CONSOLE->{input}->{auto_activated} = 1;
1247 $CONSOLE->{input}->focus_in; 1597 $CONSOLE->{input}->grab_focus;
1248 1598
1249 if ($preset && $CONSOLE->{input}->get_text eq '') { 1599 if ($preset && $CONSOLE->{input}->get_text eq '') {
1250 $CONSOLE->{input}->set_text ($preset); 1600 $CONSOLE->{input}->set_text ($preset);
1251 } 1601 }
1252 } 1602 }
1253 }); 1603 });
1254 $MAPWIDGET->show; 1604 $MAPWIDGET->show;
1255 $MAPWIDGET->focus_in; 1605 $MAPWIDGET->grab_focus;
1256 1606
1257 $LOGVIEW = new CFClient::UI::TextView 1607 $LOGVIEW = new CFClient::UI::TextScroller
1258 expand => 1, 1608 expand => 1,
1259 font => $FONT_FIXED, 1609 font => $FONT_FIXED,
1260 fontsize => $::CFG->{log_fontsize}, 1610 fontsize => $::CFG->{log_fontsize},
1611 indent => -4,
1261 can_hover => 1, 1612 can_hover => 1,
1262 can_events => 1, 1613 can_events => 1,
1263 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1614 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1264 ; 1615 ;
1265 1616
1617 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1618 title => "Setup",
1619 name => "setup_dialog",
1620 x => 'center',
1621 y => 'center',
1622 z => 2,
1623 force_w => $::WIDTH * 0.6,
1624 force_h => $::HEIGHT * 0.6,
1625 has_close_button => 1,
1626 ;
1627
1628 $METASERVER = metaserver_dialog;
1629
1630 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1631 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1632
1633 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1634 "Configure the server to play on, your username, password and other server-related options.");
1635 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1636 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1637 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1638 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1639 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1640 "Configure the use of audio, sound effects and background music.");
1641 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1642 "Lets you define, edit and delete key bindings."
1643 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1644 . "with nothing set and the recording started. After doing the actions you "
1645 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1646 . "After pressing the combo the binding will be saved automatically and the "
1647 . "binding editor closes");
1648 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1649 "Some debuggin' options. Do not ask.");
1650
1266 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1651 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1267 1652
1268 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1653 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1269 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1654 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1270 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1655
1271 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1272 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1656 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1273 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1657 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1274 1658
1275 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 1659 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
1276 1660
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1278 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1279 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1661 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1280 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1662 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1281 ."You can also hit the Tab-key to show/hide the Inventory.");
1282 1663
1283 $BUTTONBAR->add (new CFClient::UI::Button 1664 $BUTTONBAR->add (new CFClient::UI::Button
1284 text => "Save Config", 1665 text => "Save Config",
1285 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1666 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1286 on_activate => sub { 1667 on_activate => sub {
1287 $::CFG->{layout} = CFClient::UI::get_layout; 1668 $::CFG->{layout} = CFClient::UI::get_layout;
1288 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1669 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1289 status "Configuration Saved"; 1670 status "Configuration Saved";
1671 0
1290 }, 1672 },
1291 ); 1673 );
1292 1674
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1675 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1294 tooltip => "View Documentation"); 1676 tooltip => "View Documentation");
1295
1296 $BUTTONBAR->add (new CFClient::UI::Flopper
1297 text => "Bindings",
1298 other => make_binding_window,
1299 tooltip =>
1300 "Lets you define, edit and delete bindings."
1301 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1302 ."with nothing set and the recording started. After doing the actions you "
1303 ."want to record press Insert and you will be asked to press a key-combo."
1304 ."After pressing the combo the binding will be saved automatically and the "
1305 ."binding editor closes");
1306
1307 $BUTTONBAR->add (new CFClient::UI::Flopper
1308 text => "Spells",
1309 other => make_spell_list,
1310 tooltip => "The spell list");
1311
1312 $BUTTONBAR->add (new CFClient::UI::Flopper
1313 text => "Pickup",
1314 other => make_pickup_cfg_window,
1315 tooltip => "The pickup dialog");
1316
1317 1677
1318 $BUTTONBAR->add (new CFClient::UI::Button 1678 $BUTTONBAR->add (new CFClient::UI::Button
1319 text => "Quit", 1679 text => "Quit",
1320 tooltip => "Terminates the program", 1680 tooltip => "Terminates the program",
1321 on_activate => sub { 1681 on_activate => sub {
1322 if ($CONN) { 1682 if ($CONN) {
1323 open_quit_dialog; 1683 open_quit_dialog;
1324 } else { 1684 } else {
1325 exit; 1685 exit;
1326 } 1686 }
1687 0
1327 }, 1688 },
1328 ); 1689 );
1329 1690
1330 $BUTTONBAR->show; 1691 $BUTTONBAR->show;
1331 $SERVER_SETUP->show; 1692 $SETUP_DIALOG->show;
1332
1333 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1334 } 1693 }
1694
1695 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1335} 1696}
1336 1697
1337sub video_shutdown { 1698sub video_shutdown {
1699 CFClient::OpenGL::shutdown;
1700
1338 undef $SDL_ACTIVE; 1701 undef $SDL_ACTIVE;
1339} 1702}
1340 1703
1341my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1704my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1342my $bgmusic;#TODO#hack#d# 1705my $bgmusic;#TODO#hack#d#
… …
1471}; 1834};
1472 1835
1473 CFClient::SDL_GL_SwapBuffers; 1836 CFClient::SDL_GL_SwapBuffers;
1474} 1837}
1475 1838
1476my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1839my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1477 $NOW = time; 1840 $NOW = time;
1478 1841
1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1842 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1480 for CFClient::SDL_PollEvent; 1843 for CFClient::SDL_PollEvent;
1481 1844
… …
1548############################################################################# 1911#############################################################################
1549 1912
1550$SIG{INT} = $SIG{TERM} = sub { exit }; 1913$SIG{INT} = $SIG{TERM} = sub { exit };
1551 1914
1552{ 1915{
1553 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1916 local $SIG{__DIE__} = sub {
1917 return unless defined $^S && !$^S;
1918 Carp::confess $_[1];#d#TODO: remove when stable
1919 CFClient::fatal $_[0];
1920 };
1554 1921
1555 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1922 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1556 CFClient::UI::set_layout ($::CFG->{layout}); 1923 CFClient::UI::set_layout ($::CFG->{layout});
1557 1924
1558 my %DEF_CFG = ( 1925 my %DEF_CFG = (
1559 sdl_mode => 0, 1926 sdl_mode => 0,
1560 width => 640, 1927 width => 640,
1561 height => 480, 1928 height => 480,
1562 fullscreen => 0, 1929 fullscreen => 0,
1563 fast => 0, 1930 fast => 0,
1564 map_scale => 1, 1931 map_scale => 1,
1565 fow_enable => 1, 1932 fow_enable => 1,
1566 fow_intensity => 0.45, 1933 fow_intensity => 0.45,
1567 fow_smooth => 0, 1934 fow_smooth => 0,
1568 gui_fontsize => 1, 1935 gui_fontsize => 1,
1569 log_fontsize => 1, 1936 log_fontsize => 0.7,
1570 gauge_fontsize=> 1, 1937 gauge_fontsize => 1,
1571 gauge_size => 0.35, 1938 gauge_size => 0.35,
1572 stat_fontsize => 1, 1939 stat_fontsize => 0.7,
1573 mapsize => 100, 1940 mapsize => 100,
1574 host => "crossfire.schmorp.de",
1575 say_command => 'say', 1941 say_command => 'say',
1576 audio_enable => 1, 1942 audio_enable => 1,
1577 bgm_enable => 1, 1943 bgm_enable => 1,
1578 bgm_volume => 0.25, 1944 bgm_volume => 0.25,
1579 face_prefetch => 0, 1945 face_prefetch => 0,
1580 output_sync => 1, 1946 output_sync => 1,
1581 output_count => 1, 1947 output_count => 1,
1948 pickup => 0,
1949 default => "profile", # default profile
1950 );
1582 ); 1951
1583
1584 while (my ($k, $v) = each %DEF_CFG) { 1952 while (my ($k, $v) = each %DEF_CFG) {
1585 $CFG->{$k} = $v unless exists $CFG->{$k}; 1953 $CFG->{$k} = $v unless exists $CFG->{$k};
1586 } 1954 }
1955
1956 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1587 1957
1588 sdl_init; 1958 sdl_init;
1589 1959
1590 @SDL_MODES = reverse 1960 @SDL_MODES = reverse
1591 grep $_->[0] >= 640 && $_->[1] >= 480, 1961 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1633 video_init; 2003 video_init;
1634 audio_init; 2004 audio_init;
1635} 2005}
1636 2006
1637Event::loop; 2007Event::loop;
2008#CFClient::SDL_Quit;
2009#CFClient::_exit 0;
1638 2010
1639END { CFClient::SDL_Quit } 2011END { CFClient::SDL_Quit }
1640 2012
1641=head1 NAME 2013=head1 NAME
1642 2014

Diff Legend

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