ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.77 by elmex, Wed Jun 21 12:59:23 2006 UTC

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

Diff Legend

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