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.80 by root, Mon Jun 26 21:59:04 2006 UTC

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

Diff Legend

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