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.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;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44 45
45$Event::DIED = sub { 46$Event::DIED = sub {
… …
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
88our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $SERVER_INFO;
89 91
90our $SETUP_DIALOG; 92our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 93our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 94our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 95our $SETUP_KEYBOARD;
94our $SETUP_SPELLS; 96our $SETUP_SPELLS;
95 97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
96our $FLOORBOX; 100our $FLOORBOX;
97our $GAUGES; 101our $GAUGES;
98our $STATWIDS; 102our $STATWIDS;
99 103
100our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
112our $INV; 116our $INV;
113our $INVR; 117our $INVR;
114our $INV_RIGHT_HB; 118our $INV_RIGHT_HB;
115 119
116our $BIND_EDITOR; 120our $BIND_EDITOR;
121our $BIND_UPD_CB;
117 122
118our $PICKUP_CFG; 123our $PICKUP_CFG;
119 124
120sub status { 125sub status {
121 $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]);
… …
123 128
124sub debug { 129sub debug {
125 $DEBUG_STATUS->set_text ($_[0]); 130 $DEBUG_STATUS->set_text ($_[0]);
126} 131}
127 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
128sub start_game { 323sub start_game {
129 status "logging in..."; 324 status "logging in...";
130 325
131 $LOGIN_BUTTON->set_text ("Logout"); 326 $LOGIN_BUTTON->set_text ("Logout");
132 $SETUP_DIALOG->hide; 327 $SETUP_DIALOG->hide;
133 328
134 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;
135 330
136 my ($host, $port) = split /:/, $CFG->{host}; 331 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
137 332
138 $MAP = new CFClient::Map $mapsize, $mapsize; 333 $MAP = new CFClient::Map $mapsize, $mapsize;
139 334
140 $CONN = eval { 335 $CONN = eval {
141 new CFClient::Protocol 336 new CFClient::Protocol
142 host => $host, 337 host => $host,
143 port => $port || 13327, 338 port => $port || 13327,
144 user => $CFG->{user}, 339 user => $CFG->{profile}{default}{user},
145 pass => $CFG->{password}, 340 pass => $CFG->{profile}{default}{password},
146 mapw => $mapsize, 341 mapw => $mapsize,
147 maph => $mapsize, 342 maph => $mapsize,
148 343
149 map_widget => $MAPWIDGET, 344 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW, 345 logview => $LOGVIEW,
151 statusbox => $STATUSBOX, 346 statusbox => $STATUSBOX,
152 map => $MAP, 347 map => $MAP,
153 mapmap => $MAPMAP, 348 mapmap => $MAPMAP,
349 query => \&server_query,
154 350
155 sound_play => sub { 351 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_; 352 my ($x, $y, $soundnum, $type) = @_;
157 353
158 $SDL_MIXER 354 $SDL_MIXER
… …
178sub stop_game { 374sub stop_game {
179 $LOGIN_BUTTON->set_text ("Login"); 375 $LOGIN_BUTTON->set_text ("Login");
180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show; 377 $SETUP_DIALOG->show;
182 $INV_WINDOW->hide; 378 $INV_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells;
183 380
184 return unless $CONN; 381 return unless $CONN;
185 382
186 status "connection closed"; 383 status "connection closed";
187 384
385 destroy_query_dialog $CONN;
188 $CONN->destroy; 386 $CONN->destroy;
189 $CONN = 0; # false, does not autovivify 387 $CONN = 0; # false, does not autovivify
388
389 undef $MAP;
190} 390}
191 391
192sub graphics_setup { 392sub graphics_setup {
193 my $vbox = new CFClient::UI::VBox; 393 my $vbox = new CFClient::UI::VBox;
194 394
… …
212 412
213 $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");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 414 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fullscreen}, 415 state => $CFG->{fullscreen},
216 tooltip => "Bring the client into fullscreen mode.", 416 tooltip => "Bring the client into fullscreen mode.",
217 on_changed => sub { 417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fullscreen} = $value;
220 }
221 ); 418 );
222 419
223 $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");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fast}, 422 state => $CFG->{fast},
226 tooltip => "Lower the visual quality considerably to speed up rendering.", 423 tooltip => "Lower the visual quality considerably to speed up rendering.",
227 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fast} = $value;
230 }
231 ); 425 );
232 426
233 $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");
234 $table->add (1, $row++, new CFClient::UI::Slider 428 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 429 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 430 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
237 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{map_scale} = 2 ** $value;
240 }
241 ); 432 );
242 433
243 $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");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 435 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_enable}, 436 state => $CFG->{fow_enable},
246 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.",
247 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_enable} = $value;
250 }
251 ); 439 );
252 440
253 $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");
254 $table->add (1, $row++, new CFClient::UI::Slider 442 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 443 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.", 444 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 { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
258 my ($self, $value) = @_;
259 $CFG->{fow_intensity} = $value;
260 }
261 ); 446 );
262 447
263 $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");
264 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
265 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
266 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.",
267 on_changed => sub { 452 on_changed => sub {
268 my ($self, $value) = @_; 453 my ($self, $value) = @_;
269 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
270 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
271 } 457 }
272 ); 458 );
273 459
274 $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");
275 $table->add (1, $row++, new CFClient::UI::Slider 461 $table->add (1, $row++, new CFClient::UI::Slider
276 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 462 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.", 463 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] }, 464 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
279 ); 465 );
280 466
281 $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");
282 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 469 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.", 470 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]) }, 471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
286 ); 472 );
287 473
288 $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");
289 475
290 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 477 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.", 478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
293 on_changed => sub { 479 on_changed => sub {
294 $CFG->{stat_fontsize} = $_[1]; 480 $CFG->{stat_fontsize} = $_[1];
295 &set_stats_window_fontsize; 481 &set_stats_window_fontsize;
482 0
296 } 483 }
297 ); 484 );
298 485
299 $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");
300 $table->add (1, $row++, new CFClient::UI::Slider 487 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 488 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.", 489 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
303 on_changed => sub { 490 on_changed => sub {
304 $CFG->{gauge_fontsize} = $_[1]; 491 $CFG->{gauge_fontsize} = $_[1];
305 &set_gauge_window_fontsize; 492 &set_gauge_window_fontsize;
493 0
306 } 494 }
307 ); 495 );
308 496
309 $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");
310 $table->add (1, $row++, new CFClient::UI::Slider 498 $table->add (1, $row++, new CFClient::UI::Slider
311 range => [$CFG->{gauge_size}, 0.2, 0.8], 499 range => [$CFG->{gauge_size}, 0.2, 0.8],
312 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.",
313 on_changed => sub { 501 on_changed => sub {
314 $CFG->{gauge_size} = $_[1]; 502 $CFG->{gauge_size} = $_[1];
315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 503 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
504 0
316 } 505 }
317 ); 506 );
318 507
319 $table->add (1, $row++, new CFClient::UI::Button 508 $table->add (1, $row++, new CFClient::UI::Button
320 expand => 1, align => 0, text => "Apply", 509 expand => 1, align => 0, text => "Apply",
321 tooltip => "Apply the video settings", 510 tooltip => "Apply the video settings",
322 on_activate => sub { 511 on_activate => sub {
323 video_shutdown (); 512 video_shutdown ();
324 video_init (); 513 video_init ();
514 0
325 } 515 }
326 ); 516 );
327 517
328 $vbox 518 $vbox
329} 519}
… …
337 527
338 $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");
339 $table->add (1, $row++, new CFClient::UI::CheckBox 529 $table->add (1, $row++, new CFClient::UI::CheckBox
340 state => $CFG->{audio_enable}, 530 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.", 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.",
342 on_changed => sub { 532 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
343 $CFG->{audio_enable} = $_[1];
344 }
345 ); 533 );
346# $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");
347# $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 {
348# $CFG->{effects_volume} = $_[1]; 536# $CFG->{effects_volume} = $_[1];
349# }); 537# });
350 $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");
351 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
352 $hbox->add (new CFClient::UI::CheckBox 540 $hbox->add (new CFClient::UI::CheckBox
353 expand => 1, state => $CFG->{bgm_enable}, 541 expand => 1, state => $CFG->{bgm_enable},
354 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.",
355 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
356 $CFG->{bgm_enable} = $_[1];
357 }
358 ); 544 );
359 $hbox->add (new CFClient::UI::Slider 545 $hbox->add (new CFClient::UI::Slider
360 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
361 tooltip => "The volume of the background music. Changes are instant.", 547 tooltip => "The volume of the background music. Changes are instant.",
362 on_changed => sub { 548 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 ); 549 );
367 550
368 $table->add (1, $row++, new CFClient::UI::Button 551 $table->add (1, $row++, new CFClient::UI::Button
369 expand => 1, align => 0, text => "Apply", 552 expand => 1, align => 0, text => "Apply",
370 tooltip => "Apply the audio settings", 553 tooltip => "Apply the audio settings",
371 on_activate => sub { 554 on_activate => sub {
372 audio_shutdown (); 555 audio_shutdown ();
373 audio_init (); 556 audio_init ();
557 0
374 } 558 }
375 ); 559 );
376 560
377 $vbox 561 $vbox
378} 562}
… …
440 &set_gauge_window_fontsize; 624 &set_gauge_window_fontsize;
441 625
442 $win 626 $win
443} 627}
444 628
629sub debug_setup {
630 my $table = new CFClient::UI::Table;
445 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
446sub make_stats_window { 657sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 658 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 659 y => $HEIGHT * (2/8),
449 x => "max", 660 x => "max",
450 title => "Stats", 661 title => "Stats",
451 name => "stats_window"; 662 name => "stats_window",
663 has_close_button => 1;
452 664
453 $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);
454 $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,
455 can_hover => 1, can_events => 1, 667 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."); 668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
538 ); 750 );
539 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
540 font => $FONT_FIXED, 752 font => $FONT_FIXED,
541 can_hover => 1, 753 can_hover => 1,
542 can_events => 1, 754 can_events => 1,
543 image => "ui/resist/resist_$_.png", 755 path => "ui/resist/resist_$_.png",
544 tooltip => $resist_names{$_}, 756 tooltip => $resist_names{$_},
545 ); 757 );
546 758
547 $row++; 759 $row++;
548 if ($row % 6 == 0) { 760 if ($row % 6 == 0) {
… …
602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
603 $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});
604 816
605 $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);
606 818
607 # TODO: replace by CS_STAT_RES_xxx constants
608 my %tbl = ( 819 my %tbl = (
609 phys => 100, 820 phys => CS_STAT_RES_PHYS,
610 magic => 101, 821 magic => CS_STAT_RES_MAG,
611 fire => 102, 822 fire => CS_STAT_RES_FIRE,
612 elec => 103, 823 elec => CS_STAT_RES_ELEC,
613 cold => 104, 824 cold => CS_STAT_RES_COLD,
614 conf => 105, 825 conf => CS_STAT_RES_CONF,
615 acid => 106, 826 acid => CS_STAT_RES_ACID,
616 drain => 107, 827 drain => CS_STAT_RES_DRAIN,
617 ghit => 108, 828 ghit => CS_STAT_RES_GHOSTHIT,
618 pois => 109, 829 pois => CS_STAT_RES_POISON,
619 slow => 110, 830 slow => CS_STAT_RES_SLOW,
620 para => 111, 831 para => CS_STAT_RES_PARA,
621 tund => 112, 832 tund => CS_STAT_TURN_UNDEAD,
622 fear => 113, 833 fear => CS_STAT_RES_FEAR,
623 depl => 113, 834 depl => CS_STAT_RES_DEPLETE,
624 deat => 115, 835 deat => CS_STAT_RES_DEATH,
625 holyw => 116, 836 holyw => CS_STAT_RES_HOLYWORD,
626 blind => 117, 837 blind => CS_STAT_RES_BLIND,
627 ); 838 );
628 839
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 841 for keys %tbl;
631} 842}
… …
661 872
662 utf8::decode $buf if utf8::valid $buf; 873 utf8::decode $buf if utf8::valid $buf;
663 874
664 $table->clear; 875 $table->clear;
665 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 );
666 my @col = qw(Use #Users Host Uptime Version Description); 884 my @col = qw(#Users Host Uptime Version Description);
667 $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[$_])
668 for 0 .. $#col; 889 for 0 .. $#col;
669 890
670 my @align = qw(1 0 1 1 -1); 891 my @align = qw(1 0 1 1 -1);
671 892
672 my $y = 0; 893 my $y = 0;
673 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) {
… …
690 911
691 $m = [$users, $host, $uptime, $version, $desc]; 912 $m = [$users, $host, $uptime, $version, $desc];
692 913
693 $y++; 914 $y++;
694 915
695 $table->add (0, $y, new CFClient::UI::VBox children => [ 916 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
696 (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 {
697 $HOST_ENTRY->set_text ($CFG->{host} = $host); 921 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
698 $METASERVER->toggle_visibility; 922 $METASERVER->hide;
923 0
924 },
699 }), 925 ),
700 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
701 ]); 927 ]);
702 928
703 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
704 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)
705 for 0 .. $#$m; 937 for 0 .. $#$m;
706 } 938 }
707 } 939 }
708 }); 940 });
709} 941}
710 942
711sub metaserver_dialog { 943sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List", 945 title => "Server List",
714 name => 'metaserver_dialog', 946 name => 'metaserver_dialog',
715 x => 'center', 947 x => 'center',
716 y => 'center', 948 y => 'center',
717 z => 3, 949 z => 3,
950 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
952 has_close_button => 1,
719 on_visibility_change => sub { 953 on_visibility_change => sub {
720 update_metaserver if $_[1]; 954 update_metaserver if $_[1];
955 0
721 }, 956 },
722 ; 957 ;
723 958
724 $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});
725 962
726 $dialog 963 $dialog
727} 964}
728 965
729sub server_setup { 966sub server_setup {
… …
736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
737 974
738 $vbox->add ( 975 $vbox->add (
739 $HOST_ENTRY = new CFClient::UI::Entry 976 $HOST_ENTRY = new CFClient::UI::Entry
740 expand => 1, 977 expand => 1,
741 text => $CFG->{host}, 978 text => $CFG->{profile}{default}{host},
742 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",
743 on_changed => sub { 980 on_changed => sub {
744 my ($self, $value) = @_; 981 my ($self, $value) = @_;
745 $CFG->{host} = $value; 982 $CFG->{profile}{default}{host} = $value;
983 0
746 } 984 }
747 ); 985 );
748 986
749 $METASERVER = metaserver_dialog; 987 $METASERVER = metaserver_dialog;
750 988
751 $vbox->add (new CFClient::UI::Button 989 $vbox->add (new CFClient::UI::Button
752 expand => 1, 990 expand => 1,
753 text => "Server List", 991 text => "Server List",
754 other => $METASERVER, 992 other => $METASERVER,
755 tooltip => "Show a list of available crossfire servers", 993 tooltip => "Show a list of available crossfire servers",
756 on_activate => sub { $METASERVER->toggle_visibility }, 994 on_activate => sub { $METASERVER->toggle_visibility; 0 },
995 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
757 ); 996 );
758 } 997 }
759 998
760 $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");
761 $table->add (1, 4, new CFClient::UI::Entry 1000 $table->add (1, 4, new CFClient::UI::Entry
762 text => $CFG->{user}, 1001 text => $CFG->{profile}{default}{user},
763 tooltip => "The name of your character on the server", 1002 tooltip => "The name of your character on the server",
764 on_changed => sub { 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
765 my ($self, $value) = @_;
766 $CFG->{user} = $value;
767 }
768 ); 1004 );
769 1005
770 $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");
771 $table->add (1, 5, new CFClient::UI::Entry 1007 $table->add (1, 5, new CFClient::UI::Entry
772 text => $CFG->{password}, 1008 text => $CFG->{profile}{default}{password},
773 hidden => 1, 1009 hidden => 1,
774 tooltip => "The password for your character", 1010 tooltip => "The password for your character",
775 on_changed => sub { 1011 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
776 my ($self, $value) = @_;
777 $CFG->{password} = $value;
778 }
779 ); 1012 );
780 1013
781 $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");
782 $table->add (1, 7, new CFClient::UI::Slider 1015 $table->add (1, 7, new CFClient::UI::Slider
783 force_w => 100, 1016 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1017 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 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. "
786 . "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, "
787 . "but you also increase bandwidth requirements and latency. " 1020 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1021 . "This option is only used once at log-in.",
789 on_changed => sub { 1022 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 ); 1023 );
795 1024
796 $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");
797 $table->add (1, 8, new CFClient::UI::CheckBox 1026 $table->add (1, 8, new CFClient::UI::CheckBox
798 state => $CFG->{face_prefetch}, 1027 state => $CFG->{face_prefetch},
… …
801 . "This might increase or create lag, but increases the chances " 1030 . "This might increase or create lag, but increases the chances "
802 . "of faces being ready for display when you encounter them. " 1031 . "of faces being ready for display when you encounter them. "
803 . "It also uses up server bandwidth on every connect, " 1032 . "It also uses up server bandwidth on every connect, "
804 . "so only set it if you really need to prefetch images. " 1033 . "so only set it if you really need to prefetch images. "
805 . "This option can be set and unset any time.", 1034 . "This option can be set and unset any time.",
806 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1035 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
807 ); 1036 );
808 1037
809 $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");
810 $table->add (1, 9, new CFClient::UI::Entry 1039 $table->add (1, 9, new CFClient::UI::Entry
811 text => $CFG->{output_count}, 1040 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.", 1041 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] }, 1042 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
814 ); 1043 );
815 1044
816 $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");
817 $table->add (1, 10, new CFClient::UI::Entry 1046 $table->add (1, 10, new CFClient::UI::Entry
818 text => $CFG->{output_sync}, 1047 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.", 1048 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] }, 1049 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
821 ); 1050 );
822 1051
823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1052 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
824 expand => 1, 1053 expand => 1,
825 align => 0, 1054 align => 0,
826 text => "Login", 1055 text => "Login",
827 on_activate => sub { 1056 on_activate => sub {
828 $CONN ? stop_game 1057 $CONN ? stop_game
829 : start_game; 1058 : start_game;
1059 0
830 }, 1060 },
831 ); 1061 );
832 1062
833 $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");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1064 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
837 . "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. "
838 . "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.",
839 on_changed => sub { 1069 on_changed => sub {
840 my ($self, $value) = @_; 1070 my ($self, $value) = @_;
841 $CFG->{say_command} = $value; 1071 $CFG->{say_command} = $value;
1072 0
842 } 1073 }
843 ); 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);
844 1084
845 $vbox 1085 $vbox
846} 1086}
847 1087
848sub message_window { 1088sub message_window {
… …
851 title => "Messages", 1091 title => "Messages",
852 border_bg => [1, 1, 1, 1], 1092 border_bg => [1, 1, 1, 1],
853 bg => [0, 0, 0, 0.75], 1093 bg => [0, 0, 0, 0.75],
854 x => "max", 1094 x => "max",
855 y => 0, 1095 y => 0,
856 force_w => $::WIDTH / 3, 1096 force_w => $::WIDTH * 0.4,
857 force_h => $::HEIGHT / 5, 1097 force_h => $::HEIGHT * 0.5,
858 child => (my $vbox = new CFClient::UI::VBox); 1098 child => (my $vbox = new CFClient::UI::VBox),
1099 has_close_button => 1;
859 1100
860 $vbox->add ($LOGVIEW); 1101 $vbox->add ($LOGVIEW);
861 1102
862 $vbox->add (my $input = new CFClient::UI::Entry 1103 $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> " 1104 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
871 1112
872 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1113 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
873 $input->{refocus_map} = 1; 1114 $input->{refocus_map} = 1;
874 } 1115 }
875 delete $input->{auto_activated}; 1116 delete $input->{auto_activated};
1117
1118 0
876 }, 1119 },
877 on_activate => sub { 1120 on_activate => sub {
878 my ($input, $text) = @_; 1121 my ($input, $text) = @_;
879 $input->set_text (''); 1122 $input->set_text ('');
880 1123
… …
886 } 1129 }
887 if ($input->{refocus_map}) { 1130 if ($input->{refocus_map}) {
888 delete $input->{refocus_map}; 1131 delete $input->{refocus_map};
889 $MAPWIDGET->focus_in 1132 $MAPWIDGET->focus_in
890 } 1133 }
1134
1135 0
891 }, 1136 },
892 on_escape => sub { 1137 on_escape => sub {
893 $MAPWIDGET->focus_in 1138 $MAPWIDGET->grab_focus;
1139
1140 0
894 }, 1141 },
895 ); 1142 );
896 1143
897 $CONSOLE = { 1144 $CONSOLE = {
898 window => $window, 1145 window => $window,
… …
920 ); 1167 );
921 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
922 $hb->add (new CFClient::UI::Button 1169 $hb->add (new CFClient::UI::Button
923 text => "Ok", 1170 text => "Ok",
924 expand => 1, 1171 expand => 1,
925 on_activate => sub { $QUIT_DIALOG->hide }, 1172 on_activate => sub { $QUIT_DIALOG->hide; 0 },
926 ); 1173 );
927 $hb->add (new CFClient::UI::Button 1174 $hb->add (new CFClient::UI::Button
928 text => "Quit anyway", 1175 text => "Quit anyway",
929 expand => 1, 1176 expand => 1,
930 on_activate => sub { exit }, 1177 on_activate => sub { exit },
… …
973 ["Potions" => PICKUP_POTION], 1220 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED], 1222 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS], 1223 ["Jewelery" => PICKUP_JEWELS],
977 ], 1224 ],
1225 ["Weight/Value ratio", 2, 17]
978 ) 1226 )
979 { 1227 {
980 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
981 $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]);
982 1230
… …
987 $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);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1237 state => $CFG->{pickup} & $mask,
990 on_changed => sub { 1238 on_changed => sub {
991 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1240
992 if ($value) { 1241 if ($value) {
993 $::CFG->{pickup} |= $mask; 1242 $::CFG->{pickup} |= $mask;
994 } else { 1243 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1244 $::CFG->{pickup} &= ~$mask;
996 } 1245 }
1246
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1247 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1248 if defined $::CONN;
1249
1250 0
999 }); 1251 });
1000 } 1252 }
1001 } 1253 }
1002 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
1003 $table 1274 $table
1004} 1275}
1005 1276
1006sub make_inventory_window { 1277sub inventory_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1278 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1279 x => "center",
1009 y => "center", 1280 y => "center",
1010 force_w => $WIDTH * 9/10, 1281 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1282 force_h => $HEIGHT * 9/10,
1012 title => "Inventory", 1283 title => "Inventory",
1284 has_close_button => 1,
1013 ; 1285 ;
1014 1286
1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1287 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1016 1288
1017 $hb->add (my $vb1 = new CFClient::UI::VBox); 1289 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1032 1304
1033sub spell_setup { 1305sub spell_setup {
1034 new CFClient::UI::SpellList 1306 new CFClient::UI::SpellList
1035} 1307}
1036 1308
1309sub update_bindings {
1310 $BIND_UPD_CB->() if $BIND_UPD_CB;
1311}
1312
1037sub keyboard_setup { 1313sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1314 my $binding_list = new CFClient::UI::VBox;
1039 1315
1040 my $refresh; 1316 my $refresh;
1041 $refresh = sub { 1317 $refresh = $BIND_UPD_CB = sub {
1042 $binding_list->clear (); 1318 $binding_list->clear ();
1043 1319
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1320 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1321 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1322 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1323 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1324
1049 my $lbl = join "; ", @$cmds; 1325 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1326 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1327 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1328 $hb->add (new CFClient::UI::Button
1053 text => "delete", 1329 text => "delete",
1054 tooltip => "Deletes the binding", 1330 tooltip => "Deletes the binding",
1055 on_activate => sub { 1331 on_activate => sub {
1056 $binding_list->remove ($hb); 1332 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1333 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1334 0
1058 }); 1335 });
1059 1336
1060 $hb->add (new CFClient::UI::Button 1337 $hb->add (new CFClient::UI::Button
1061 text => "edit", 1338 text => "edit",
1062 tooltip => "Edits the binding", 1339 tooltip => "Edits the binding",
1063 on_activate => sub { 1340 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1341 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1342 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1066 sub { 1343 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1344 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1345 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1346 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1070 $refresh->(); 1347 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1348 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show; 1349 $SETUP_DIALOG->show;
1073 }, 1350 },
1074 sub { 1351 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1352 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show; 1353 $SETUP_DIALOG->show;
1077 }); 1354 });
1078 $::BIND_EDITOR->show; 1355 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide; 1356 $SETUP_DIALOG->hide;
1357 0
1080 }); 1358 });
1081 1359
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1360 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1361 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 } 1362 }
1085 } 1363 }
1086 }; 1364 };
1087 1365
1088 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
1089 $vb->add ($binding_list); 1379 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox); 1380 $vb->add (my $hb = new CFClient::UI::HBox);
1091 1381
1092 $hb->add (new CFClient::UI::Button 1382 $hb->add (new CFClient::UI::Button
1093 text => "record new", 1383 text => "record new",
… …
1095 tooltip => "This button opens the binding editor with an empty binding.", 1385 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub { 1386 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [], 1387 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub { 1388 sub {
1099 my ($mod, $sym, $cmds) = @_; 1389 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1390 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1101 $refresh->(); 1391 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1392 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show; 1393 $SETUP_DIALOG->show;
1104 }, 1394 },
1105 sub { 1395 sub {
… …
1107 $SETUP_DIALOG->show; 1397 $SETUP_DIALOG->show;
1108 }, 1398 },
1109 ); 1399 );
1110 $SETUP_DIALOG->hide; 1400 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show; 1401 $::BIND_EDITOR->show;
1402 0
1112 }, 1403 },
1113 ); 1404 );
1114 1405
1115 $hb->add (new CFClient::UI::Button 1406 $hb->add (new CFClient::UI::Button
1116 text => "close", 1407 text => "close",
1117 tooltip => "Closes the binding window", 1408 tooltip => "Closes the binding window",
1118 expand => 1, 1409 expand => 1,
1119 on_activate => sub { 1410 on_activate => sub {
1120 $SETUP_DIALOG->hide; 1411 $SETUP_DIALOG->hide;
1412 0
1121 } 1413 }
1122 ); 1414 );
1123 1415
1124 $refresh->(); 1416 $refresh->();
1125 1417
1126 $vb 1418 $vb
1127} 1419}
1128 1420
1129sub make_help_window { 1421sub help_window {
1130 my $win = new CFClient::UI::FancyFrame 1422 my $win = new CFClient::UI::FancyFrame
1131 x => 'center', 1423 x => 'center',
1132 y => 'center', 1424 y => 'center',
1133 z => 2, 1425 z => 2,
1134 name => 'doc_browser', 1426 name => 'doc_browser',
… …
1137 title => "Documentation"; 1429 title => "Documentation";
1138 1430
1139 $win->add (my $vbox = new CFClient::UI::VBox); 1431 $win->add (my $vbox = new CFClient::UI::VBox);
1140 1432
1141 $vbox->add (my $buttons = new CFClient::UI::HBox); 1433 $vbox->add (my $buttons = new CFClient::UI::HBox);
1142 $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);
1143 1436
1144 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 => [
1145 [intro => "Introduction"], 1441 [intro => "Introduction"],
1146 [manual => "Manual"], 1442 [manual => "Main Manual"],
1443 [skill_help => "Skill Reference"],
1444 [command_help => "Command Reference"],
1147 [command_help => "Commands"], 1445 [dmcommand_help => "DM Commands"],
1148 [skill_help => "Skills"], 1446 [COPYING => "License Terms"],
1149 ) { 1447 ],
1150 my ($pod, $label) = @$_; 1448 on_changed => sub {
1449 my ($self, $pod) = @_;
1151 1450
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", 1451 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1452 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1157 1453
1158 $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#
1159 1460
1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1461 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1161 for @$pom; 1462 for @$pom;
1162 1463
1163 $viewer->set_offset (0); 1464 $viewer->set_offset (0);
1465
1164 }, 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 },
1165 ); 1475 );
1166 }
1167
1168 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1169 1476
1170 $win 1477 $win
1171} 1478}
1172 1479
1173sub sdl_init { 1480sub sdl_init {
… …
1210 z => 100, 1517 z => 100,
1211 force_x => "max", 1518 force_x => "max",
1212 force_y => 0; 1519 force_y => 0;
1213 $DEBUG_STATUS->show; 1520 $DEBUG_STATUS->show;
1214 1521
1215 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1522 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1216 1523
1217 $STATUSBOX = new CFClient::UI::Statusbox; 1524 $STATUSBOX = new CFClient::UI::Statusbox;
1218 $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]);
1219 1526
1220 (new CFClient::UI::Frame 1527 (new CFClient::UI::Frame
… …
1240 $MAPWIDGET->connect (activate_console => sub { 1547 $MAPWIDGET->connect (activate_console => sub {
1241 my ($mapwidget, $preset) = @_; 1548 my ($mapwidget, $preset) = @_;
1242 1549
1243 if ($CONSOLE) { 1550 if ($CONSOLE) {
1244 $CONSOLE->{input}->{auto_activated} = 1; 1551 $CONSOLE->{input}->{auto_activated} = 1;
1245 $CONSOLE->{input}->focus_in; 1552 $CONSOLE->{input}->grab_focus;
1246 1553
1247 if ($preset && $CONSOLE->{input}->get_text eq '') { 1554 if ($preset && $CONSOLE->{input}->get_text eq '') {
1248 $CONSOLE->{input}->set_text ($preset); 1555 $CONSOLE->{input}->set_text ($preset);
1249 } 1556 }
1250 } 1557 }
1251 }); 1558 });
1252 $MAPWIDGET->show; 1559 $MAPWIDGET->show;
1253 $MAPWIDGET->focus_in; 1560 $MAPWIDGET->grab_focus;
1254 1561
1255 $LOGVIEW = new CFClient::UI::TextView 1562 $LOGVIEW = new CFClient::UI::TextScroller
1256 expand => 1, 1563 expand => 1,
1257 font => $FONT_FIXED, 1564 font => $FONT_FIXED,
1258 fontsize => $::CFG->{log_fontsize}, 1565 fontsize => $::CFG->{log_fontsize},
1566 indent => -4,
1259 can_hover => 1, 1567 can_hover => 1,
1260 can_events => 1, 1568 can_events => 1,
1261 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.",
1262 ; 1570 ;
1263 1571
… …
1267 x => 'center', 1575 x => 'center',
1268 y => 'center', 1576 y => 'center',
1269 z => 2, 1577 z => 2,
1270 force_w => $::WIDTH * 0.6, 1578 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6, 1579 force_h => $::HEIGHT * 0.6,
1580 has_close_button => 1,
1272 ; 1581 ;
1273 1582
1274 $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,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1584 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 1585
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1586 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "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.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1588 $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."); 1589 "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, 1590 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "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.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1592 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music."); 1593 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1594 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings." 1595 "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 " 1596 . "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 " 1597 . "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. " 1598 . "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 " 1599 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes"); 1600 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1601 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "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.");
1294 1605
1295 $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
1296 1607
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1608 $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."); 1609 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1299 1610
1300 $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,
1301 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.");
1302 1613
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 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
1304 1615
1305 $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,
1306 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.");
1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1618 $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 :). " 1619 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."); 1620 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1310 1621
1311 $BUTTONBAR->add (new CFClient::UI::Button 1622 $BUTTONBAR->add (new CFClient::UI::Button
1312 text => "Save Config", 1623 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.", 1624 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 { 1625 on_activate => sub {
1315 $::CFG->{layout} = CFClient::UI::get_layout; 1626 $::CFG->{layout} = CFClient::UI::get_layout;
1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1627 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1317 status "Configuration Saved"; 1628 status "Configuration Saved";
1629 0
1318 }, 1630 },
1319 ); 1631 );
1320 1632
1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1633 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1322 tooltip => "View Documentation"); 1634 tooltip => "View Documentation");
1323 1635
1324 $BUTTONBAR->add (new CFClient::UI::Button 1636 $BUTTONBAR->add (new CFClient::UI::Button
1325 text => "Quit", 1637 text => "Quit",
1326 tooltip => "Terminates the program", 1638 tooltip => "Terminates the program",
… …
1328 if ($CONN) { 1640 if ($CONN) {
1329 open_quit_dialog; 1641 open_quit_dialog;
1330 } else { 1642 } else {
1331 exit; 1643 exit;
1332 } 1644 }
1645 0
1333 }, 1646 },
1334 ); 1647 );
1335 1648
1336 $BUTTONBAR->show; 1649 $BUTTONBAR->show;
1337 $SETUP_DIALOG->show; 1650 $SETUP_DIALOG->show;
… …
1339 1652
1340 $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]);
1341} 1654}
1342 1655
1343sub video_shutdown { 1656sub video_shutdown {
1657 CFClient::OpenGL::shutdown;
1658
1344 undef $SDL_ACTIVE; 1659 undef $SDL_ACTIVE;
1345} 1660}
1346 1661
1347my @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#
1348my $bgmusic;#TODO#hack#d# 1663my $bgmusic;#TODO#hack#d#
… …
1564 1879
1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1880 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1566 CFClient::UI::set_layout ($::CFG->{layout}); 1881 CFClient::UI::set_layout ($::CFG->{layout});
1567 1882
1568 my %DEF_CFG = ( 1883 my %DEF_CFG = (
1569 sdl_mode => 0, 1884 sdl_mode => 0,
1570 width => 640, 1885 width => 640,
1571 height => 480, 1886 height => 480,
1572 fullscreen => 0, 1887 fullscreen => 0,
1573 fast => 0, 1888 fast => 0,
1574 map_scale => 1, 1889 map_scale => 1,
1575 fow_enable => 1, 1890 fow_enable => 1,
1576 fow_intensity => 0.45, 1891 fow_intensity => 0.45,
1577 fow_smooth => 0, 1892 fow_smooth => 0,
1578 gui_fontsize => 1, 1893 gui_fontsize => 1,
1579 log_fontsize => 1, 1894 log_fontsize => 0.7,
1580 gauge_fontsize=> 1, 1895 gauge_fontsize => 1,
1581 gauge_size => 0.35, 1896 gauge_size => 0.35,
1582 stat_fontsize => 1, 1897 stat_fontsize => 0.7,
1583 mapsize => 100, 1898 mapsize => 100,
1584 host => "crossfire.schmorp.de",
1585 say_command => 'say', 1899 say_command => 'say',
1586 audio_enable => 1, 1900 audio_enable => 1,
1587 bgm_enable => 1, 1901 bgm_enable => 1,
1588 bgm_volume => 0.25, 1902 bgm_volume => 0.25,
1589 face_prefetch => 0, 1903 face_prefetch => 0,
1590 output_sync => 1, 1904 output_sync => 1,
1591 output_count => 1, 1905 output_count => 1,
1906 pickup => 0,
1907 default => "profile", # default profile
1908 );
1592 ); 1909
1593
1594 while (my ($k, $v) = each %DEF_CFG) { 1910 while (my ($k, $v) = each %DEF_CFG) {
1595 $CFG->{$k} = $v unless exists $CFG->{$k}; 1911 $CFG->{$k} = $v unless exists $CFG->{$k};
1596 } 1912 }
1913
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1597 1915
1598 sdl_init; 1916 sdl_init;
1599 1917
1600 @SDL_MODES = reverse 1918 @SDL_MODES = reverse
1601 grep $_->[0] >= 640 && $_->[1] >= 480, 1919 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1643 video_init; 1961 video_init;
1644 audio_init; 1962 audio_init;
1645} 1963}
1646 1964
1647Event::loop; 1965Event::loop;
1966#CFClient::SDL_Quit;
1967#CFClient::_exit 0;
1648 1968
1649END { CFClient::SDL_Quit } 1969END { CFClient::SDL_Quit }
1650 1970
1651=head1 NAME 1971=head1 NAME
1652 1972

Diff Legend

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