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

Diff Legend

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