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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.94 by root, Sun Jul 16 20:04:08 2006 UTC

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

Diff Legend

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