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

Diff Legend

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