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.58 by root, Mon Jun 5 22:07:43 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 44
43$Event::DIED = sub { 45$Event::DIED = sub {
44 # TODO: display dialog box or so 46 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
87 90
88our $SETUP_DIALOG; 91our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 93our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
92our $SETUP_SPELLS; 95our $SETUP_SPELLS;
93 96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
94our $FLOORBOX; 99our $FLOORBOX;
95our $GAUGES; 100our $GAUGES;
96our $STATWIDS; 101our $STATWIDS;
97 102
98our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120} 125}
121 126
122sub debug { 127sub debug {
123 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
129}
130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 0
161 }
162 );
163 $hbox->add (new CFClient::UI::Button
164 text => "Yes",
165 on_activate => sub {
166 $conn->send ("reply y");
167 destroy_query_dialog $conn;
168 0
169 },
170 );
171
172 $dialog->grab_focus;
173
174 } elsif ($flags & CS_QUERY_SINGLECHAR) {
175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
176
177 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
178 $MESSAGE_WINDOW->show;
179
180 unshift @dialog, new CFClient::UI::Label
181 max_w => $::WIDTH * 0.4,
182 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n";
184
185 unshift @dialog, my $table = new CFClient::UI::Table;
186
187 $table->add (0, 0, new CFClient::UI::Button
188 text => "Next Race",
189 on_activate => sub {
190 $conn->send ("reply n");
191 destroy_query_dialog $conn;
192 0
193 },
194 );
195 $table->add (2, 0, new CFClient::UI::Button
196 text => "Accept",
197 on_activate => sub {
198 $conn->send ("reply d");
199 destroy_query_dialog $conn;
200 0
201 },
202 );
203
204 unshift @dialog, new CFClient::UI::Label
205 max_w => $::WIDTH * 0.4,
206 ellipsise => 0,
207 markup =>
208 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, "
214 . "so you can take your time making this important choice."
215 ;
216
217 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat");
220 destroy_query_dialog $conn;
221 return;
222 }
223
224 $STATS_WINDOW->show;
225 $MESSAGE_WINDOW->hide;
226
227 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4,
229 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n";
231
232 unshift @dialog, my $table = new CFClient::UI::Table;
233
234 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button
236 text => "Roll Again",
237 on_activate => sub {
238 $conn->send ("reply y");
239 destroy_query_dialog $conn;
240 0
241 },
242 );
243
244 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
246 value => $_,
247 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
251 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
252 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
253 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
254 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
255 ],
256 ), 1 .. 2;
257
258 $table->add (2, 0, new CFClient::UI::Button
259 text => "Swap Stats",
260 on_activate => sub {
261 $conn->{stat_change_with} = $sw2->{value};
262 $conn->send ("reply $sw1->{value}");
263 destroy_query_dialog $conn;
264 0
265 },
266 );
267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
268
269 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept",
272 on_activate => sub {
273 $conn->send ("reply n");
274 $STATS_WINDOW->hide;
275 destroy_query_dialog $conn;
276 0
277 },
278 );
279
280 unshift @dialog, new CFClient::UI::Label
281 max_w => $::WIDTH * 0.4,
282 ellipsise => 0,
283 markup =>
284 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats "
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
288 . "Race selection will influence those values later on."
289 ;
290 }
291
292 push @dialog, my $entry = new CFClient::UI::Entry
293 on_changed => sub {
294 $conn->send ("reply $_[1]");
295 destroy_query_dialog $conn;
296 0
297 },
298 ;
299
300 $entry->grab_focus;
301
302 } else {
303 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
304
305 push @dialog, my $entry = new CFClient::UI::Entry
306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
307 on_activate => sub {
308 $conn->send ("reply $_[1]");
309 destroy_query_dialog $conn;
310 0
311 },
312 ;
313
314 $entry->grab_focus;
315 }
316
317 $vbox->add (@dialog);
318 $dialog->show;
124} 319}
125 320
126sub start_game { 321sub start_game {
127 status "logging in..."; 322 status "logging in...";
128 323
… …
147 map_widget => $MAPWIDGET, 342 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 343 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 344 statusbox => $STATUSBOX,
150 map => $MAP, 345 map => $MAP,
151 mapmap => $MAPMAP, 346 mapmap => $MAPMAP,
347 query => \&server_query,
152 348
153 sound_play => sub { 349 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 350 my ($x, $y, $soundnum, $type) = @_;
155 351
156 $SDL_MIXER 352 $SDL_MIXER
… …
176sub stop_game { 372sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login"); 373 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 375 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 376 $INV_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells;
181 378
182 return unless $CONN; 379 return unless $CONN;
183 380
184 status "connection closed"; 381 status "connection closed";
185 382
383 destroy_query_dialog $CONN;
186 $CONN->destroy; 384 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 385 $CONN = 0; # false, does not autovivify
188} 386}
189 387
190sub graphics_setup { 388sub graphics_setup {
… …
210 408
211 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 409 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
212 $table->add (1, $row++, new CFClient::UI::CheckBox 410 $table->add (1, $row++, new CFClient::UI::CheckBox
213 state => $CFG->{fullscreen}, 411 state => $CFG->{fullscreen},
214 tooltip => "Bring the client into fullscreen mode.", 412 tooltip => "Bring the client into fullscreen mode.",
215 on_changed => sub { 413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216 my ($self, $value) = @_;
217 $CFG->{fullscreen} = $value;
218 }
219 ); 414 );
220 415
221 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 416 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222 $table->add (1, $row++, new CFClient::UI::CheckBox 417 $table->add (1, $row++, new CFClient::UI::CheckBox
223 state => $CFG->{fast}, 418 state => $CFG->{fast},
224 tooltip => "Lower the visual quality considerably to speed up rendering.", 419 tooltip => "Lower the visual quality considerably to speed up rendering.",
225 on_changed => sub { 420 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226 my ($self, $value) = @_;
227 $CFG->{fast} = $value;
228 }
229 ); 421 );
230 422
231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 423 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
232 $table->add (1, $row++, new CFClient::UI::Slider 424 $table->add (1, $row++, new CFClient::UI::Slider
233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 425 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 426 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235 on_changed => sub { 427 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236 my ($self, $value) = @_;
237 $CFG->{map_scale} = 2 ** $value;
238 }
239 ); 428 );
240 429
241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 430 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
242 $table->add (1, $row++, new CFClient::UI::CheckBox 431 $table->add (1, $row++, new CFClient::UI::CheckBox
243 state => $CFG->{fow_enable}, 432 state => $CFG->{fow_enable},
244 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 433 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245 on_changed => sub { 434 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246 my ($self, $value) = @_;
247 $CFG->{fow_enable} = $value;
248 }
249 ); 435 );
250 436
251 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 437 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252 $table->add (1, $row++, new CFClient::UI::Slider 438 $table->add (1, $row++, new CFClient::UI::Slider
253 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 439 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
254 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 440 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
255 on_changed => sub { 441 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256 my ($self, $value) = @_;
257 $CFG->{fow_intensity} = $value;
258 }
259 ); 442 );
260 443
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, new CFClient::UI::CheckBox
263 state => $CFG->{fow_smooth}, 446 state => $CFG->{fow_smooth},
264 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 447 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265 on_changed => sub { 448 on_changed => sub {
266 my ($self, $value) = @_; 449 my ($self, $value) = @_;
267 $CFG->{fow_smooth} = $value; 450 $CFG->{fow_smooth} = $value;
268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 451 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
452 0
269 } 453 }
270 ); 454 );
271 455
272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273 $table->add (1, $row++, new CFClient::UI::Slider 457 $table->add (1, $row++, new CFClient::UI::Slider
274 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 458 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
275 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 459 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
276 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 460 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277 ); 461 );
278 462
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 463 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 464 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 466 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
283 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
284 ); 468 );
285 469
286 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
287 471
288 $table->add (1, $row++, new CFClient::UI::Slider 472 $table->add (1, $row++, new CFClient::UI::Slider
289 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
290 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
291 on_changed => sub { 475 on_changed => sub {
292 $CFG->{stat_fontsize} = $_[1]; 476 $CFG->{stat_fontsize} = $_[1];
293 &set_stats_window_fontsize; 477 &set_stats_window_fontsize;
478 0
294 } 479 }
295 ); 480 );
296 481
297 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
299 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
300 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301 on_changed => sub { 486 on_changed => sub {
302 $CFG->{gauge_fontsize} = $_[1]; 487 $CFG->{gauge_fontsize} = $_[1];
303 &set_gauge_window_fontsize; 488 &set_gauge_window_fontsize;
489 0
304 } 490 }
305 ); 491 );
306 492
307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 493 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
308 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFClient::UI::Slider
309 range => [$CFG->{gauge_size}, 0.2, 0.8], 495 range => [$CFG->{gauge_size}, 0.2, 0.8],
310 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 496 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311 on_changed => sub { 497 on_changed => sub {
312 $CFG->{gauge_size} = $_[1]; 498 $CFG->{gauge_size} = $_[1];
313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0
314 } 501 }
315 ); 502 );
316 503
317 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
318 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
319 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
320 on_activate => sub { 507 on_activate => sub {
321 video_shutdown (); 508 video_shutdown ();
322 video_init (); 509 video_init ();
510 0
323 } 511 }
324 ); 512 );
325 513
326 $vbox 514 $vbox
327} 515}
… …
335 523
336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
337 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
338 state => $CFG->{audio_enable}, 526 state => $CFG->{audio_enable},
339 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
340 on_changed => sub { 528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
341 $CFG->{audio_enable} = $_[1];
342 }
343 ); 529 );
344# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 530# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
345# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 531# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
346# $CFG->{effects_volume} = $_[1]; 532# $CFG->{effects_volume} = $_[1];
347# }); 533# });
348 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
349 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
350 $hbox->add (new CFClient::UI::CheckBox 536 $hbox->add (new CFClient::UI::CheckBox
351 expand => 1, state => $CFG->{bgm_enable}, 537 expand => 1, state => $CFG->{bgm_enable},
352 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 538 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
353 on_changed => sub { 539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
354 $CFG->{bgm_enable} = $_[1];
355 }
356 ); 540 );
357 $hbox->add (new CFClient::UI::Slider 541 $hbox->add (new CFClient::UI::Slider
358 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
359 tooltip => "The volume of the background music. Changes are instant.", 543 tooltip => "The volume of the background music. Changes are instant.",
360 on_changed => sub { 544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
361 $CFG->{bgm_volume} = $_[1];
362 CFClient::MixMusic::volume $_[1] * 128;
363 }
364 ); 545 );
365 546
366 $table->add (1, $row++, new CFClient::UI::Button 547 $table->add (1, $row++, new CFClient::UI::Button
367 expand => 1, align => 0, text => "Apply", 548 expand => 1, align => 0, text => "Apply",
368 tooltip => "Apply the audio settings", 549 tooltip => "Apply the audio settings",
369 on_activate => sub { 550 on_activate => sub {
370 audio_shutdown (); 551 audio_shutdown ();
371 audio_init (); 552 audio_init ();
553 0
372 } 554 }
373 ); 555 );
374 556
375 $vbox 557 $vbox
376} 558}
… …
438 &set_gauge_window_fontsize; 620 &set_gauge_window_fontsize;
439 621
440 $win 622 $win
441} 623}
442 624
625sub debug_setup {
626 my $table = new CFClient::UI::Table;
443 627
628 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
629 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
630 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
631 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
632 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
633 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
634 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
635 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
636
637 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
638
639 for my $x (0..2) {
640 for my $y (0 .. 2) {
641 $table->add ($x + 3, $y,
642 new CFClient::UI::Entry
643 text => $default_smooth[$x * 3 + $y],
644 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
645 );
646 }
647 }
648
649
650 $table
651}
652
444sub make_stats_window { 653sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 654 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 655 y => $HEIGHT * (2/8),
447 x => "max", 656 x => "max",
448 title => "Stats", 657 title => "Stats",
449 name => "stats_window"; 658 name => "stats_window",
659 has_close_button => 1;
450 660
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 661 $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, 662 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 663 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."); 664 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602 812
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604 814
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = ( 815 my %tbl = (
607 phys => 100, 816 phys => CS_STAT_RES_PHYS,
608 magic => 101, 817 magic => CS_STAT_RES_MAG,
609 fire => 102, 818 fire => CS_STAT_RES_FIRE,
610 elec => 103, 819 elec => CS_STAT_RES_ELEC,
611 cold => 104, 820 cold => CS_STAT_RES_COLD,
612 conf => 105, 821 conf => CS_STAT_RES_CONF,
613 acid => 106, 822 acid => CS_STAT_RES_ACID,
614 drain => 107, 823 drain => CS_STAT_RES_DRAIN,
615 ghit => 108, 824 ghit => CS_STAT_RES_GHOSTHIT,
616 pois => 109, 825 pois => CS_STAT_RES_POISON,
617 slow => 110, 826 slow => CS_STAT_RES_SLOW,
618 para => 111, 827 para => CS_STAT_RES_PARA,
619 tund => 112, 828 tund => CS_STAT_TURN_UNDEAD,
620 fear => 113, 829 fear => CS_STAT_RES_FEAR,
621 depl => 113, 830 depl => CS_STAT_RES_DEPLETE,
622 deat => 115, 831 deat => CS_STAT_RES_DEATH,
623 holyw => 116, 832 holyw => CS_STAT_RES_HOLYWORD,
624 blind => 117, 833 blind => CS_STAT_RES_BLIND,
625 ); 834 );
626 835
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 837 for keys %tbl;
629} 838}
… …
659 868
660 utf8::decode $buf if utf8::valid $buf; 869 utf8::decode $buf if utf8::valid $buf;
661 870
662 $table->clear; 871 $table->clear;
663 872
873 my @tip = (
874 "The current number of users logged in on the server.",
875 "The hostname of the server.",
876 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.",
879 );
664 my @col = qw(Use #Users Host Uptime Version Description); 880 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 881 $table->add ($_, 0, new CFClient::UI::Label
882 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 885 for 0 .. $#col;
667 886
668 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
669 888
670 my $y = 0; 889 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 890 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
688 907
689 $m = [$users, $host, $uptime, $version, $desc]; 908 $m = [$users, $host, $uptime, $version, $desc];
690 909
691 $y++; 910 $y++;
692 911
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", on_activate => sub { 913 (new CFClient::UI::Button
914 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub {
695 $HOST_ENTRY->set_text ($CFG->{host} = $host); 917 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility; 918 $METASERVER->hide;
919 0
920 },
697 }), 921 ),
698 (new CFClient::UI::Empty expand => 1), 922 (new CFClient::UI::Empty expand => 1),
699 ]); 923 ]);
700 924
701 $table->add ($_ + 1, $y, new CFClient::UI::Label 925 $table->add ($_, $y, new CFClient::UI::Label
702 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 926 ellipsise => 0,
927 align => $align[$_],
928 text => $m->[$_],
929 tooltip => $tip[$_],
930 can_hover => 1,
931 can_events => 1,
932 fontsize => 0.8)
703 for 0 .. $#$m; 933 for 0 .. $#$m;
704 } 934 }
705 } 935 }
706 }); 936 });
707} 937}
708 938
709sub metaserver_dialog { 939sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame 940 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List", 941 title => "Server List",
712 name => 'metaserver_dialog', 942 name => 'metaserver_dialog',
713 x => 'center', 943 x => 'center',
714 y => 'center', 944 y => 'center',
715 z => 3, 945 z => 3,
946 force_h => $::HEIGHT * 0.4,
716 child => (my $vbox = new CFClient::UI::VBox), 947 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub { 948 on_visibility_change => sub {
718 update_metaserver if $_[1]; 949 update_metaserver if $_[1];
950 0
719 }, 951 },
720 ; 952 ;
721 953
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723 957
724 $dialog 958 $dialog
725} 959}
726 960
727sub server_setup { 961sub server_setup {
… …
739 text => $CFG->{host}, 973 text => $CFG->{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 974 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 975 on_changed => sub {
742 my ($self, $value) = @_; 976 my ($self, $value) = @_;
743 $CFG->{host} = $value; 977 $CFG->{host} = $value;
978 0
744 } 979 }
745 ); 980 );
746 981
747 $METASERVER = metaserver_dialog; 982 $METASERVER = metaserver_dialog;
748 983
749 $vbox->add (new CFClient::UI::Button 984 $vbox->add (new CFClient::UI::Button
750 expand => 1, 985 expand => 1,
751 text => "Server List", 986 text => "Server List",
752 other => $METASERVER, 987 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 988 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 989 on_activate => sub { $METASERVER->toggle_visibility; 0 },
990 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 991 );
756 } 992 }
757 993
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 994 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 995 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 996 text => $CFG->{user},
761 tooltip => "The name of your character on the server", 997 tooltip => "The name of your character on the server",
762 on_changed => sub { 998 on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 999 );
767 1000
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1001 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 1002 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 1003 text => $CFG->{password},
771 hidden => 1, 1004 hidden => 1,
772 tooltip => "The password for your character", 1005 tooltip => "The password for your character",
773 on_changed => sub { 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1007 );
778 1008
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1009 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1010 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 1011 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1012 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1013 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, " 1014 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1015 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1016 . "This option is only used once at log-in.",
787 on_changed => sub { 1017 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 ); 1018 );
793 1019
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1020 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1021 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1022 state => $CFG->{face_prefetch},
… …
799 . "This might increase or create lag, but increases the chances " 1025 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1026 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1027 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1028 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1029 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1030 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1031 );
806 1032
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1033 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1034 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 1035 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.", 1036 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] }, 1037 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1038 );
813 1039
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1040 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1041 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1042 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.", 1043 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] }, 1044 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1045 );
820 1046
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1047 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1048 expand => 1,
823 align => 0, 1049 align => 0,
824 text => "Login", 1050 text => "Login",
825 on_activate => sub { 1051 on_activate => sub {
826 $CONN ? stop_game 1052 $CONN ? stop_game
827 : start_game; 1053 : start_game;
1054 0
828 }, 1055 },
829 ); 1056 );
830 1057
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1058 $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 1059 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1062 . "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.", 1063 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1064 on_changed => sub {
838 my ($self, $value) = @_; 1065 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1066 $CFG->{say_command} = $value;
1067 0
840 } 1068 }
841 ); 1069 );
1070
1071 $vbox->add (new CFClient::UI::Label
1072 text => "Server Info",
1073 fontsize => 1.2,
1074 padding_y => 8,
1075 fg => [1, 1, 0, 1],
1076 );
1077
1078 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1079
843 $vbox 1080 $vbox
844} 1081}
845 1082
846sub message_window { 1083sub message_window {
… …
849 title => "Messages", 1086 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1087 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1088 bg => [0, 0, 0, 0.75],
852 x => "max", 1089 x => "max",
853 y => 0, 1090 y => 0,
854 force_w => $::WIDTH / 3, 1091 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1092 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1093 child => (my $vbox = new CFClient::UI::VBox),
1094 has_close_button => 1;
857 1095
858 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
859 1097
860 $vbox->add (my $input = new CFClient::UI::Entry 1098 $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> " 1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
869 1107
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1109 $input->{refocus_map} = 1;
872 } 1110 }
873 delete $input->{auto_activated}; 1111 delete $input->{auto_activated};
1112
1113 0
874 }, 1114 },
875 on_activate => sub { 1115 on_activate => sub {
876 my ($input, $text) = @_; 1116 my ($input, $text) = @_;
877 $input->set_text (''); 1117 $input->set_text ('');
878 1118
… …
884 } 1124 }
885 if ($input->{refocus_map}) { 1125 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1126 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1127 $MAPWIDGET->focus_in
888 } 1128 }
1129
1130 0
889 }, 1131 },
890 on_escape => sub { 1132 on_escape => sub {
891 $MAPWIDGET->focus_in 1133 $MAPWIDGET->grab_focus;
1134
1135 0
892 }, 1136 },
893 ); 1137 );
894 1138
895 $CONSOLE = { 1139 $CONSOLE = {
896 window => $window, 1140 window => $window,
… …
918 ); 1162 );
919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1163 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
920 $hb->add (new CFClient::UI::Button 1164 $hb->add (new CFClient::UI::Button
921 text => "Ok", 1165 text => "Ok",
922 expand => 1, 1166 expand => 1,
923 on_activate => sub { $QUIT_DIALOG->hide }, 1167 on_activate => sub { $QUIT_DIALOG->hide; 0 },
924 ); 1168 );
925 $hb->add (new CFClient::UI::Button 1169 $hb->add (new CFClient::UI::Button
926 text => "Quit anyway", 1170 text => "Quit anyway",
927 expand => 1, 1171 expand => 1,
928 on_activate => sub { exit }, 1172 on_activate => sub { exit },
… …
971 ["Potions" => PICKUP_POTION], 1215 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1216 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => PICKUP_NOT_CURSED], 1217 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => PICKUP_JEWELS], 1218 ["Jewelery" => PICKUP_JEWELS],
975 ], 1219 ],
1220 ["Weight/Value ratio", 2, 17]
976 ) 1221 )
977 { 1222 {
978 my ($title, $x, $y, @bits) = @$_; 1223 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1224 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980 1225
… …
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1232 state => $CFG->{pickup} & $mask,
988 on_changed => sub { 1233 on_changed => sub {
989 my ($box, $value) = @_; 1234 my ($box, $value) = @_;
1235
990 if ($value) { 1236 if ($value) {
991 $::CFG->{pickup} |= $mask; 1237 $::CFG->{pickup} |= $mask;
992 } else { 1238 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1239 $::CFG->{pickup} &= ~$mask;
994 } 1240 }
1241
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1242 $::CONN->send_command ("pickup $::CFG->{pickup}")
996 if defined $::CONN; 1243 if defined $::CONN;
1244
1245 0
997 }); 1246 });
998 } 1247 }
999 } 1248 }
1000 1249
1250 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1],
1252 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub {
1254 my ($slider, $value) = @_;
1255
1256 $::CFG->{pickup} &= ~0x7;
1257 $::CFG->{pickup} |= int $value
1258 if $value;
1259 1;
1260 });
1261 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set",
1263 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN;
1266 0
1267 });
1268
1001 $table 1269 $table
1002} 1270}
1003 1271
1004sub make_inventory_window { 1272sub inventory_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1274 x => "center",
1007 y => "center", 1275 y => "center",
1008 force_w => $WIDTH * 9/10, 1276 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1277 force_h => $HEIGHT * 9/10,
1010 title => "Inventory", 1278 title => "Inventory",
1279 has_close_button => 1,
1011 ; 1280 ;
1012 1281
1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1014 1283
1015 $hb->add (my $vb1 = new CFClient::UI::VBox); 1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1051 text => "delete", 1320 text => "delete",
1052 tooltip => "Deletes the binding", 1321 tooltip => "Deletes the binding",
1053 on_activate => sub { 1322 on_activate => sub {
1054 $binding_list->remove ($hb); 1323 $binding_list->remove ($hb);
1055 delete $::CFG->{bindings}->{$mod}->{$sym}; 1324 delete $::CFG->{bindings}->{$mod}->{$sym};
1325 0
1056 }); 1326 });
1057 1327
1058 $hb->add (new CFClient::UI::Button 1328 $hb->add (new CFClient::UI::Button
1059 text => "edit", 1329 text => "edit",
1060 tooltip => "Edits the binding", 1330 tooltip => "Edits the binding",
… …
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $SETUP_DIALOG->show; 1344 $SETUP_DIALOG->show;
1075 }); 1345 });
1076 $::BIND_EDITOR->show; 1346 $::BIND_EDITOR->show;
1077 $SETUP_DIALOG->hide; 1347 $SETUP_DIALOG->hide;
1348 0
1078 }); 1349 });
1079 1350
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 } 1353 }
1083 } 1354 }
1084 }; 1355 };
1085 1356
1086 my $vb = new CFClient::UI::VBox; 1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1360 $hb->add (new CFClient::UI::CheckBox
1361 expand => 1,
1362 state => $CFG->{shift_fire_stop},
1363 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1364 on_changed => sub {
1365 my ($cbox, $value) = @_;
1366 $CFG->{shift_fire_stop} = $value;
1367 0
1368 });
1369
1087 $vb->add ($binding_list); 1370 $vb->add ($binding_list);
1088 $vb->add (my $hb = new CFClient::UI::HBox); 1371 $vb->add (my $hb = new CFClient::UI::HBox);
1089 1372
1090 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1091 text => "record new", 1374 text => "record new",
… …
1105 $SETUP_DIALOG->show; 1388 $SETUP_DIALOG->show;
1106 }, 1389 },
1107 ); 1390 );
1108 $SETUP_DIALOG->hide; 1391 $SETUP_DIALOG->hide;
1109 $::BIND_EDITOR->show; 1392 $::BIND_EDITOR->show;
1393 0
1110 }, 1394 },
1111 ); 1395 );
1112 1396
1113 $hb->add (new CFClient::UI::Button 1397 $hb->add (new CFClient::UI::Button
1114 text => "close", 1398 text => "close",
1115 tooltip => "Closes the binding window", 1399 tooltip => "Closes the binding window",
1116 expand => 1, 1400 expand => 1,
1117 on_activate => sub { 1401 on_activate => sub {
1118 $SETUP_DIALOG->hide; 1402 $SETUP_DIALOG->hide;
1403 0
1119 } 1404 }
1120 ); 1405 );
1121 1406
1122 $refresh->(); 1407 $refresh->();
1123 1408
1124 $vb 1409 $vb
1125} 1410}
1126 1411
1127sub make_help_window { 1412sub help_window {
1128 my $win = new CFClient::UI::FancyFrame 1413 my $win = new CFClient::UI::FancyFrame
1129 x => 'center', 1414 x => 'center',
1130 y => 'center', 1415 y => 'center',
1131 z => 2, 1416 z => 2,
1132 name => 'doc_browser', 1417 name => 'doc_browser',
… …
1135 title => "Documentation"; 1420 title => "Documentation";
1136 1421
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1422 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1423
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1424 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1426 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1427
1142 for ( 1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef,
1431 options => [
1143 [intro => "Introduction"], 1432 [intro => "Introduction"],
1144 [manual => "Manual"], 1433 [manual => "Manual"],
1434 [skill_help => "Skills"],
1145 [command_help => "Commands"], 1435 [command_help => "Commands"],
1146 [skill_help => "Skills"], 1436 [dmcommand_help => "DM Commands"],
1147 ) { 1437 [COPYING => "License Terms"],
1148 my ($pod, $label) = @$_; 1438 ],
1439 on_changed => sub {
1440 my ($self, $pod) = @_;
1149 1441
1150 $buttons->add (new CFClient::UI::Button
1151 text => $label,
1152 on_activate => sub {
1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1155 1444
1156 $viewer->clear; 1445 $viewer->clear;
1157 1446
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @$pom; 1448 for @$pom;
1160 1449
1161 $viewer->set_offset (0); 1450 $viewer->set_offset (0);
1162 }, 1451 0
1452 },
1453 on_visibility_change => sub {
1454 my ($self, $visible) = @_;
1455 return unless $visible;
1456 return if $self->{value};
1457 $self->set_value ("intro");
1458 0
1459 },
1163 ); 1460 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1461
1168 $win 1462 $win
1169} 1463}
1170 1464
1171sub sdl_init { 1465sub sdl_init {
… …
1238 $MAPWIDGET->connect (activate_console => sub { 1532 $MAPWIDGET->connect (activate_console => sub {
1239 my ($mapwidget, $preset) = @_; 1533 my ($mapwidget, $preset) = @_;
1240 1534
1241 if ($CONSOLE) { 1535 if ($CONSOLE) {
1242 $CONSOLE->{input}->{auto_activated} = 1; 1536 $CONSOLE->{input}->{auto_activated} = 1;
1243 $CONSOLE->{input}->focus_in; 1537 $CONSOLE->{input}->grab_focus;
1244 1538
1245 if ($preset && $CONSOLE->{input}->get_text eq '') { 1539 if ($preset && $CONSOLE->{input}->get_text eq '') {
1246 $CONSOLE->{input}->set_text ($preset); 1540 $CONSOLE->{input}->set_text ($preset);
1247 } 1541 }
1248 } 1542 }
1249 }); 1543 });
1250 $MAPWIDGET->show; 1544 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1545 $MAPWIDGET->grab_focus;
1252 1546
1253 $LOGVIEW = new CFClient::UI::TextView 1547 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1548 expand => 1,
1255 font => $FONT_FIXED, 1549 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1550 fontsize => $::CFG->{log_fontsize},
1551 indent => -4,
1257 can_hover => 1, 1552 can_hover => 1,
1258 can_events => 1, 1553 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1554 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1555 ;
1261 1556
… …
1265 x => 'center', 1560 x => 'center',
1266 y => 'center', 1561 y => 'center',
1267 z => 2, 1562 z => 2,
1268 force_w => $::WIDTH * 0.6, 1563 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6, 1564 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1,
1270 ; 1566 ;
1271 1567
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274 1570
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1572 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1573 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1574 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the " 1584 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes"); 1585 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggign options. Do not ask.");
1292 1590
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294 1592
1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1594 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297 1595
1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300 1598
1301 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 1599 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
1302 1600
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308 1606
1309 $BUTTONBAR->add (new CFClient::UI::Button 1607 $BUTTONBAR->add (new CFClient::UI::Button
1310 text => "Save Config", 1608 text => "Save Config",
1311 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1312 on_activate => sub { 1610 on_activate => sub {
1313 $::CFG->{layout} = CFClient::UI::get_layout; 1611 $::CFG->{layout} = CFClient::UI::get_layout;
1314 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1612 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1315 status "Configuration Saved"; 1613 status "Configuration Saved";
1614 0
1316 }, 1615 },
1317 ); 1616 );
1318 1617
1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1320 tooltip => "View Documentation"); 1619 tooltip => "View Documentation");
1321 1620
1322 $BUTTONBAR->add (new CFClient::UI::Button 1621 $BUTTONBAR->add (new CFClient::UI::Button
1323 text => "Quit", 1622 text => "Quit",
1324 tooltip => "Terminates the program", 1623 tooltip => "Terminates the program",
… …
1326 if ($CONN) { 1625 if ($CONN) {
1327 open_quit_dialog; 1626 open_quit_dialog;
1328 } else { 1627 } else {
1329 exit; 1628 exit;
1330 } 1629 }
1630 0
1331 }, 1631 },
1332 ); 1632 );
1333 1633
1334 $BUTTONBAR->show; 1634 $BUTTONBAR->show;
1335 $SETUP_DIALOG->show; 1635 $SETUP_DIALOG->show;
… …
1337 1637
1338 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1638 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1339} 1639}
1340 1640
1341sub video_shutdown { 1641sub video_shutdown {
1642 CFClient::OpenGL::shutdown;
1643
1342 undef $SDL_ACTIVE; 1644 undef $SDL_ACTIVE;
1343} 1645}
1344 1646
1345my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1647my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1346my $bgmusic;#TODO#hack#d# 1648my $bgmusic;#TODO#hack#d#
… …
1572 map_scale => 1, 1874 map_scale => 1,
1573 fow_enable => 1, 1875 fow_enable => 1,
1574 fow_intensity => 0.45, 1876 fow_intensity => 0.45,
1575 fow_smooth => 0, 1877 fow_smooth => 0,
1576 gui_fontsize => 1, 1878 gui_fontsize => 1,
1577 log_fontsize => 1, 1879 log_fontsize => 0.7,
1578 gauge_fontsize=> 1, 1880 gauge_fontsize=> 1,
1579 gauge_size => 0.35, 1881 gauge_size => 0.35,
1580 stat_fontsize => 1, 1882 stat_fontsize => 0.7,
1581 mapsize => 100, 1883 mapsize => 100,
1582 host => "crossfire.schmorp.de", 1884 host => "crossfire.schmorp.de",
1583 say_command => 'say', 1885 say_command => 'say',
1584 audio_enable => 1, 1886 audio_enable => 1,
1585 bgm_enable => 1, 1887 bgm_enable => 1,
1586 bgm_volume => 0.25, 1888 bgm_volume => 0.25,
1587 face_prefetch => 0, 1889 face_prefetch => 0,
1588 output_sync => 1, 1890 output_sync => 1,
1589 output_count => 1, 1891 output_count => 1,
1892 pickup => 0,
1590 ); 1893 );
1591 1894
1592 while (my ($k, $v) = each %DEF_CFG) { 1895 while (my ($k, $v) = each %DEF_CFG) {
1593 $CFG->{$k} = $v unless exists $CFG->{$k}; 1896 $CFG->{$k} = $v unless exists $CFG->{$k};
1594 } 1897 }
… …
1641 video_init; 1944 video_init;
1642 audio_init; 1945 audio_init;
1643} 1946}
1644 1947
1645Event::loop; 1948Event::loop;
1949#CFClient::SDL_Quit;
1950#CFClient::_exit 0;
1646 1951
1647END { CFClient::SDL_Quit } 1952END { CFClient::SDL_Quit }
1648 1953
1649=head1 NAME 1954=head1 NAME
1650 1955

Diff Legend

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