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

Diff Legend

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