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

Diff Legend

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