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.54 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.84 by root, Sun Jul 2 18:52:05 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable 48 Carp::confess $_[1];#d#TODO: remove when stable
47 CFClient::error $_[1]; 49 CFClient::error $_[1];
… …
83our $CONSOLE; 85our $CONSOLE;
84our $METASERVER; 86our $METASERVER;
85our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
86our $QUIT_DIALOG; 88our $QUIT_DIALOG;
87our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $SERVER_INFO;
88 91
89our $SETUP_DIALOG; 92our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK; 93our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 94our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 95our $SETUP_KEYBOARD;
93our $SETUP_SPELLS; 96our $SETUP_SPELLS;
94 97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
95our $FLOORBOX; 100our $FLOORBOX;
96our $GAUGES; 101our $GAUGES;
97our $STATWIDS; 102our $STATWIDS;
98 103
99our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
111our $INV; 116our $INV;
112our $INVR; 117our $INVR;
113our $INV_RIGHT_HB; 118our $INV_RIGHT_HB;
114 119
115our $BIND_EDITOR; 120our $BIND_EDITOR;
121our $BIND_UPD_CB;
116 122
117our $PICKUP_CFG; 123our $PICKUP_CFG;
118 124
119sub status { 125sub status {
120 $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]);
… …
122 128
123sub debug { 129sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 130 $DEBUG_STATUS->set_text ($_[0]);
125} 131}
126 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
127sub start_game { 323sub start_game {
128 status "logging in..."; 324 status "logging in...";
129 325
130 $LOGIN_BUTTON->set_text ("Logout"); 326 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide; 327 $SETUP_DIALOG->hide;
132 328
133 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;
134 330
135 my ($host, $port) = split /:/, $CFG->{host}; 331 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
136 332
137 $MAP = new CFClient::Map $mapsize, $mapsize; 333 $MAP = new CFClient::Map $mapsize, $mapsize;
138 334
139 $CONN = eval { 335 $CONN = eval {
140 new CFClient::Protocol 336 new CFClient::Protocol
141 host => $host, 337 host => $host,
142 port => $port || 13327, 338 port => $port || 13327,
143 user => $CFG->{user}, 339 user => $CFG->{profile}{default}{user},
144 pass => $CFG->{password}, 340 pass => $CFG->{profile}{default}{password},
145 mapw => $mapsize, 341 mapw => $mapsize,
146 maph => $mapsize, 342 maph => $mapsize,
147 343
148 map_widget => $MAPWIDGET, 344 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 345 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 346 statusbox => $STATUSBOX,
151 map => $MAP, 347 map => $MAP,
152 mapmap => $MAPMAP, 348 mapmap => $MAPMAP,
349 query => \&server_query,
153 350
154 sound_play => sub { 351 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 352 my ($x, $y, $soundnum, $type) = @_;
156 353
157 $SDL_MIXER 354 $SDL_MIXER
… …
177sub stop_game { 374sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 375 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
180 $SETUP_DIALOG->show; 377 $SETUP_DIALOG->show;
181 $INV_WINDOW->hide; 378 $INV_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells;
182 380
183 return unless $CONN; 381 return unless $CONN;
184 382
185 status "connection closed"; 383 status "connection closed";
186 384
385 destroy_query_dialog $CONN;
187 $CONN->destroy; 386 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 387 $CONN = 0; # false, does not autovivify
388
389 undef $MAP;
189} 390}
190 391
191sub graphics_setup { 392sub graphics_setup {
192 my $vbox = new CFClient::UI::VBox; 393 my $vbox = new CFClient::UI::VBox;
193 394
… …
211 412
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 414 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fullscreen}, 415 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 416 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 418 );
221 419
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fast}, 422 state => $CFG->{fast},
225 tooltip => "Lower the visual quality considerably to speed up rendering.", 423 tooltip => "Lower the visual quality considerably to speed up rendering.",
226 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fast} = $value;
229 }
230 ); 425 );
231 426
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 428 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 429 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 430 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 432 );
241 433
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 435 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_enable}, 436 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 439 );
251 440
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 442 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 443 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 444 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 446 );
261 447
262 $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");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
265 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.",
266 on_changed => sub { 452 on_changed => sub {
267 my ($self, $value) = @_; 453 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
269 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
270 } 457 }
271 ); 458 );
272 459
273 $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");
274 $table->add (1, $row++, new CFClient::UI::Slider 461 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 463 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 464 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278 ); 465 );
279 466
280 $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");
281 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 470 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 ); 472 );
286 473
287 $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");
288 475
289 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub { 479 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1]; 480 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize; 481 &set_stats_window_fontsize;
482 0
295 } 483 }
296 ); 484 );
297 485
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 487 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 489 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 490 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 491 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 492 &set_gauge_window_fontsize;
493 0
305 } 494 }
306 ); 495 );
307 496
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 498 $table->add (1, $row++, new CFClient::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 499 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 501 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 502 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 503 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
504 0
315 } 505 }
316 ); 506 );
317 507
318 $table->add (1, $row++, new CFClient::UI::Button 508 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply", 509 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings", 510 tooltip => "Apply the video settings",
321 on_activate => sub { 511 on_activate => sub {
322 video_shutdown (); 512 video_shutdown ();
323 video_init (); 513 video_init ();
514 0
324 } 515 }
325 ); 516 );
326 517
327 $vbox 518 $vbox
328} 519}
… …
336 527
337 $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");
338 $table->add (1, $row++, new CFClient::UI::CheckBox 529 $table->add (1, $row++, new CFClient::UI::CheckBox
339 state => $CFG->{audio_enable}, 530 state => $CFG->{audio_enable},
340 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
341 on_changed => sub { 532 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342 $CFG->{audio_enable} = $_[1];
343 }
344 ); 533 );
345# $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");
346# $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 {
347# $CFG->{effects_volume} = $_[1]; 536# $CFG->{effects_volume} = $_[1];
348# }); 537# });
349 $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");
350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
351 $hbox->add (new CFClient::UI::CheckBox 540 $hbox->add (new CFClient::UI::CheckBox
352 expand => 1, state => $CFG->{bgm_enable}, 541 expand => 1, state => $CFG->{bgm_enable},
353 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.",
354 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355 $CFG->{bgm_enable} = $_[1];
356 }
357 ); 544 );
358 $hbox->add (new CFClient::UI::Slider 545 $hbox->add (new CFClient::UI::Slider
359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360 tooltip => "The volume of the background music. Changes are instant.", 547 tooltip => "The volume of the background music. Changes are instant.",
361 on_changed => sub { 548 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
362 $CFG->{bgm_volume} = $_[1];
363 CFClient::MixMusic::volume $_[1] * 128;
364 }
365 ); 549 );
366 550
367 $table->add (1, $row++, new CFClient::UI::Button 551 $table->add (1, $row++, new CFClient::UI::Button
368 expand => 1, align => 0, text => "Apply", 552 expand => 1, align => 0, text => "Apply",
369 tooltip => "Apply the audio settings", 553 tooltip => "Apply the audio settings",
370 on_activate => sub { 554 on_activate => sub {
371 audio_shutdown (); 555 audio_shutdown ();
372 audio_init (); 556 audio_init ();
557 0
373 } 558 }
374 ); 559 );
375 560
376 $vbox 561 $vbox
377} 562}
… …
439 &set_gauge_window_fontsize; 624 &set_gauge_window_fontsize;
440 625
441 $win 626 $win
442} 627}
443 628
629sub debug_setup {
630 my $table = new CFClient::UI::Table;
444 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
445sub make_stats_window { 657sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 658 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8), 659 y => $HEIGHT * (2/8),
448 x => "max", 660 x => "max",
449 title => "Stats", 661 title => "Stats",
450 name => "stats_window"; 662 name => "stats_window",
663 has_close_button => 1;
451 664
452 $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);
453 $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,
454 can_hover => 1, can_events => 1, 667 can_hover => 1, can_events => 1,
455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
481 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
482 695
483 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 696 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
484 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 697 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
485 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 698 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
486 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 699 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
487 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 700 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
488 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 701 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
489 ) { 702 ) {
490 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 703 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
491 704
… …
510 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
511 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
512 pois => "<b>Poison</b> (resistance to getting poisoned)", 725 pois => "<b>Poison</b> (resistance to getting poisoned)",
513 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
514 deat => "<b>Death</b> (resistance against death spells)", 727 deat => "<b>Death</b> (resistance against death spells)",
515 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
516 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
517 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 730 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
518 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
519 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
520 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
537 ); 750 );
538 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
539 font => $FONT_FIXED, 752 font => $FONT_FIXED,
540 can_hover => 1, 753 can_hover => 1,
541 can_events => 1, 754 can_events => 1,
542 image => "ui/resist/resist_$_.png", 755 path => "ui/resist/resist_$_.png",
543 tooltip => $resist_names{$_}, 756 tooltip => $resist_names{$_},
544 ); 757 );
545 758
546 $row++; 759 $row++;
547 if ($row % 6 == 0) { 760 if ($row % 6 == 0) {
… …
595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
600 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
601 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602 $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});
603 816
604 $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);
605 818
606 # TODO: replace by CS_STAT_RES_xxx constants
607 my %tbl = ( 819 my %tbl = (
608 phys => 100, 820 phys => CS_STAT_RES_PHYS,
609 magic => 101, 821 magic => CS_STAT_RES_MAG,
610 fire => 102, 822 fire => CS_STAT_RES_FIRE,
611 elec => 103, 823 elec => CS_STAT_RES_ELEC,
612 cold => 104, 824 cold => CS_STAT_RES_COLD,
613 conf => 105, 825 conf => CS_STAT_RES_CONF,
614 acid => 106, 826 acid => CS_STAT_RES_ACID,
615 drain => 107, 827 drain => CS_STAT_RES_DRAIN,
616 ghit => 108, 828 ghit => CS_STAT_RES_GHOSTHIT,
617 pois => 109, 829 pois => CS_STAT_RES_POISON,
618 slow => 110, 830 slow => CS_STAT_RES_SLOW,
619 para => 111, 831 para => CS_STAT_RES_PARA,
620 tund => 112, 832 tund => CS_STAT_TURN_UNDEAD,
621 fear => 113, 833 fear => CS_STAT_RES_FEAR,
622 depl => 113, 834 depl => CS_STAT_RES_DEPLETE,
623 deat => 115, 835 deat => CS_STAT_RES_DEATH,
624 holyw => 116, 836 holyw => CS_STAT_RES_HOLYWORD,
625 blind => 117, 837 blind => CS_STAT_RES_BLIND,
626 ); 838 );
627 839
628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629 for keys %tbl; 841 for keys %tbl;
630} 842}
631 843
632my $METASERVER_ATIME; 844my $METASERVER_ATIME;
633 845
634sub update_metaserver { 846sub update_metaserver {
847 my ($metaserver_dialog) = @_;
848
849 $METASERVER = $metaserver_dialog
850 if defined $metaserver_dialog;
851
635 return if $METASERVER_ATIME > time; 852 return if $METASERVER_ATIME > time;
636 $METASERVER_ATIME = time + 60; 853 $METASERVER_ATIME = time + 60;
637 854
638 my $table = $METASERVER->{table}; 855 my $table = $METASERVER->{table};
639 $table->clear; 856 $table->clear;
… …
660 877
661 utf8::decode $buf if utf8::valid $buf; 878 utf8::decode $buf if utf8::valid $buf;
662 879
663 $table->clear; 880 $table->clear;
664 881
882 my @tip = (
883 "The current number of users logged in on the server.",
884 "The hostname of the server.",
885 "The time this server has been running without being restarted.",
886 "The server software version - a '+' indicates a Crossfire+ server.",
887 "Short information about this server provided by its admins.",
888 );
665 my @col = qw(Use #Users Host Uptime Version Description); 889 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 890 $table->add ($_, 0, new CFClient::UI::Label
891 can_hover => 1, can_events => 1,
892 align => 0, fg => [1, 1, 0],
893 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 894 for 0 .. $#col;
668 895
669 my @align = qw(1 0 1 1 -1); 896 my @align = qw(1 0 1 1 -1);
670 897
671 my $y = 0; 898 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 899 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 916
690 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
691 918
692 $y++; 919 $y++;
693 920
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 921 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 922 (new CFClient::UI::Button
923 text => "Use",
924 tooltip => "Put this server into the <b>Host:Port</b> field",
925 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 926 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697 $METASERVER->toggle_visibility; 927 $METASERVER->hide;
928 0
929 },
698 }), 930 ),
699 (new CFClient::UI::Empty expand => 1), 931 (new CFClient::UI::Empty expand => 1),
700 ]); 932 ]);
701 933
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 934 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 935 ellipsise => 0,
936 align => $align[$_],
937 text => $m->[$_],
938 tooltip => $tip[$_],
939 can_hover => 1,
940 can_events => 1,
941 fontsize => 0.8)
704 for 0 .. $#$m; 942 for 0 .. $#$m;
705 } 943 }
706 } 944 }
707 }); 945 });
708} 946}
709 947
710sub metaserver_dialog { 948sub metaserver_dialog {
949 my $vbox = new CFClient::UI::VBox;
950 my $table = new CFClient::UI::Table;
951 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
952
711 my $dialog = new CFClient::UI::FancyFrame 953 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 954 title => "Server List",
713 name => 'metaserver_dialog', 955 name => 'metaserver_dialog',
714 x => 'center', 956 x => 'center',
715 y => 'center', 957 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox), 958 z => 3,
959 force_h => $::HEIGHT * 0.4,
960 child => $vbox,
961 has_close_button => 1,
962 table => $table,
717 on_visibility_change => sub { 963 on_visibility_change => sub {
718 update_metaserver if $_[1]; 964 update_metaserver ($_[0]) if $_[1];
965 0
719 }, 966 },
720 ; 967 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723 968
724 $dialog 969 $dialog
725} 970}
726 971
727sub server_setup { 972sub server_setup {
… …
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 979 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 980
736 $vbox->add ( 981 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 982 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 983 expand => 1,
739 text => $CFG->{host}, 984 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 985 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 986 on_changed => sub {
742 my ($self, $value) = @_; 987 my ($self, $value) = @_;
743 $CFG->{host} = $value; 988 $CFG->{profile}{default}{host} = $value;
989 0
744 } 990 }
745 ); 991 );
746
747 $METASERVER = metaserver_dialog;
748 992
749 $vbox->add (new CFClient::UI::Button 993 $vbox->add (new CFClient::UI::Button
750 expand => 1, 994 expand => 1,
751 text => "Server List", 995 text => "Server List",
752 other => $METASERVER, 996 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 997 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 998 on_activate => sub { $METASERVER->toggle_visibility; 0 },
999 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 1000 );
756 } 1001 }
757 1002
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1003 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 1004 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 1005 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1006 tooltip => "The name of your character on the server",
762 on_changed => sub { 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1008 );
767 1009
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1010 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 1011 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 1012 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1013 hidden => 1,
772 tooltip => "The password for your character", 1014 tooltip => "The password for your character",
773 on_changed => sub { 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1016 );
778 1017
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1019 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 1020 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1021 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1022 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1023 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1024 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1025 . "This option is only used once at log-in.",
787 on_changed => sub { 1026 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1027 );
793 1028
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1029 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1030 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1031 state => $CFG->{face_prefetch},
… …
799 . "This might increase or create lag, but increases the chances " 1034 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1035 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1036 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1037 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1038 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1039 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1040 );
806 1041
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1042 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1043 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 1044 text => $CFG->{output_count},
810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1045 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1046 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1047 );
813 1048
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1049 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1050 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1051 text => $CFG->{output_sync},
817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1052 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1053 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1054 );
820 1055
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1056 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1057 expand => 1,
823 align => 0, 1058 align => 0,
824 text => "Login", 1059 text => "Login",
825 on_activate => sub { 1060 on_activate => sub {
826 $CONN ? stop_game 1061 $CONN ? stop_game
827 : start_game; 1062 : start_game;
1063 0
828 }, 1064 },
829 ); 1065 );
830 1066
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1067 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1068 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1071 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1072 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1073 on_changed => sub {
838 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1075 $CFG->{say_command} = $value;
1076 0
840 } 1077 }
841 ); 1078 );
1079
1080 $vbox->add (new CFClient::UI::Label
1081 text => "Server Info",
1082 fontsize => 1.2,
1083 padding_y => 8,
1084 fg => [1, 1, 0, 1],
1085 );
1086
1087 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1088
843 $vbox 1089 $vbox
844} 1090}
845 1091
846sub message_window { 1092sub message_window {
… …
849 title => "Messages", 1095 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1097 bg => [0, 0, 0, 0.75],
852 x => "max", 1098 x => "max",
853 y => 0, 1099 y => 0,
854 force_w => $::WIDTH / 3, 1100 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1101 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1102 child => (my $vbox = new CFClient::UI::VBox),
1103 has_close_button => 1;
857 1104
858 $vbox->add ($LOGVIEW); 1105 $vbox->add ($LOGVIEW);
859 1106
860 $vbox->add (my $input = new CFClient::UI::Entry 1107 $vbox->add (my $input = new CFClient::UI::Entry
861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1108 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
869 1116
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1117 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1118 $input->{refocus_map} = 1;
872 } 1119 }
873 delete $input->{auto_activated}; 1120 delete $input->{auto_activated};
1121
1122 0
874 }, 1123 },
875 on_activate => sub { 1124 on_activate => sub {
876 my ($input, $text) = @_; 1125 my ($input, $text) = @_;
877 $input->set_text (''); 1126 $input->set_text ('');
878 1127
… …
884 } 1133 }
885 if ($input->{refocus_map}) { 1134 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1135 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1136 $MAPWIDGET->focus_in
888 } 1137 }
1138
1139 0
889 }, 1140 },
890 on_escape => sub { 1141 on_escape => sub {
891 $MAPWIDGET->focus_in 1142 $MAPWIDGET->grab_focus;
1143
1144 0
892 }, 1145 },
893 ); 1146 );
894 1147
895 $CONSOLE = { 1148 $CONSOLE = {
896 window => $window, 1149 window => $window,
… …
903sub open_quit_dialog { 1156sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1157 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1158 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1159 x => "center",
907 y => "center", 1160 y => "center",
1161 z => 50,
908 title => "Really Quit?", 1162 title => "Really Quit?",
909 ; 1163 ;
910 1164
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1165 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1166
… …
917 ); 1171 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1172 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1173 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1174 text => "Ok",
921 expand => 1, 1175 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1176 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1177 );
924 $hb->add (new CFClient::UI::Button 1178 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1179 text => "Quit anyway",
926 expand => 1, 1180 expand => 1,
927 on_activate => sub { exit }, 1181 on_activate => sub { exit },
… …
934sub autopickup_setup { 1188sub autopickup_setup {
935 my $table = new CFClient::UI::Table; 1189 my $table = new CFClient::UI::Table;
936 1190
937 for ( 1191 for (
938 ["General", 0, 0, 1192 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1193 ["Enable autopickup" => PICKUP_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1194 ["Inhibit autopickup" => PICKUP_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1195 ["Stop before pickup" => PICKUP_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1196 ["Debug autopickup" => PICKUP_DEBUG],
943 ], 1197 ],
944 ["Weapons", 0, 6, 1198 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1199 ["All weapons" => PICKUP_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1200 ["Missile weapons" => PICKUP_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW], 1201 ["Bows" => PICKUP_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW], 1202 ["Arrows" => PICKUP_ARROW],
949 ], 1203 ],
950 ["Armour", 0, 12, 1204 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET], 1205 ["Helmets" => PICKUP_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD], 1206 ["Shields" => PICKUP_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1207 ["Body Armour" => PICKUP_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS], 1208 ["Boots" => PICKUP_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1209 ["Gloves" => PICKUP_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1210 ["Cloaks" => PICKUP_CLOAK],
957 ], 1211 ],
958 1212
959 ["Readables", 2, 2, 1213 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1214 ["Spellbooks" => PICKUP_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1215 ["Skillscrolls" => PICKUP_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1216 ["Normal Books/Scrolls" => PICKUP_READABLES],
963 ], 1217 ],
964 ["Misc", 2, 7, 1218 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD], 1219 ["Food" => PICKUP_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK], 1220 ["Drinks" => PICKUP_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1221 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY], 1222 ["Keys" => PICKUP_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1223 ["Magical Items" => PICKUP_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION], 1224 ["Potions" => PICKUP_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1225 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1226 ["Ignore cursed" => PICKUP_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1227 ["Jewelery" => PICKUP_JEWELS],
974 ], 1228 ],
1229 ["Weight/Value ratio", 2, 17]
975 ) 1230 )
976 { 1231 {
977 my ($title, $x, $y, @bits) = @$_; 1232 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1233 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979 1234
… …
981 ++$y; 1236 ++$y;
982 1237
983 my $mask = $_->[1]; 1238 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1239 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1240 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask, 1241 state => $::CFG->{pickup} & $mask,
987 on_changed => sub { 1242 on_changed => sub {
988 my ($box, $value) = @_; 1243 my ($box, $value) = @_;
1244
989 if ($value) { 1245 if ($value) {
990 $::CFG->{pickup} |= $mask; 1246 $::CFG->{pickup} |= $mask;
991 } else { 1247 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1248 $::CFG->{pickup} &= ~$mask;
993 } 1249 }
1250
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1251 $::CONN->send_command ("pickup $::CFG->{pickup}")
995 if defined $::CONN; 1252 if defined $::CONN;
1253
1254 0
996 }); 1255 });
997 } 1256 }
998 } 1257 }
999 1258
1259 $table->add (2, 18, new CFClient::UI::ValSlider
1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1261 template => ">= 99",
1262 to_value => sub { ">= " . 5 * $_[0] },
1263 on_changed => sub {
1264 my ($slider, $value) = @_;
1265
1266 $::CFG->{pickup} &= ~0xF;
1267 $::CFG->{pickup} |= int $value
1268 if $value;
1269 1;
1270 });
1271
1272 $table->add (3, 18, new CFClient::UI::Button
1273 text => "set",
1274 on_activate => sub {
1275 $::CONN->send_command ("pickup $::CFG->{pickup}")
1276 if defined $::CONN;
1277 0
1278 });
1279
1000 $table 1280 $table
1001} 1281}
1002 1282
1003sub make_inventory_window { 1283sub inventory_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1284 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1285 x => "center",
1006 y => "center", 1286 y => "center",
1007 force_w => $WIDTH * 9/10, 1287 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1288 force_h => $HEIGHT * 9/10,
1009 title => "Inventory", 1289 title => "Inventory",
1290 name => "inventory_window",
1291 has_close_button => 1,
1010 ; 1292 ;
1011 1293
1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1294 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1013 1295
1014 $hb->add (my $vb1 = new CFClient::UI::VBox); 1296 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1029 1311
1030sub spell_setup { 1312sub spell_setup {
1031 new CFClient::UI::SpellList 1313 new CFClient::UI::SpellList
1032} 1314}
1033 1315
1316sub update_bindings {
1317 $BIND_UPD_CB->() if $BIND_UPD_CB;
1318}
1319
1034sub keyboard_setup { 1320sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox; 1321 my $binding_list = new CFClient::UI::VBox;
1036 1322
1037 my $refresh; 1323 my $refresh;
1038 $refresh = sub { 1324 $refresh = $BIND_UPD_CB = sub {
1039 $binding_list->clear (); 1325 $binding_list->clear ();
1040 1326
1041 for my $mod (keys %{$::CFG->{bindings}}) { 1327 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1328 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1329 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1330 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045 1331
1046 my $lbl = join "; ", @$cmds; 1332 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1333 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox); 1334 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button 1335 $hb->add (new CFClient::UI::Button
1050 text => "delete", 1336 text => "delete",
1051 tooltip => "Deletes the binding", 1337 tooltip => "Deletes the binding",
1052 on_activate => sub { 1338 on_activate => sub {
1053 $binding_list->remove ($hb); 1339 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym}; 1340 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1341 0
1055 }); 1342 });
1056 1343
1057 $hb->add (new CFClient::UI::Button 1344 $hb->add (new CFClient::UI::Button
1058 text => "edit", 1345 text => "edit",
1059 tooltip => "Edits the binding", 1346 tooltip => "Edits the binding",
1060 on_activate => sub { 1347 on_activate => sub {
1061 $::BIND_EDITOR->set_binding ( 1348 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1349 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1063 sub { 1350 sub {
1064 my ($nmod, $nsym, $ncmds) = @_; 1351 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym}; 1352 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1353 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1067 $refresh->(); 1354 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1355 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show; 1356 $SETUP_DIALOG->show;
1070 }, 1357 },
1071 sub { 1358 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1359 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show; 1360 $SETUP_DIALOG->show;
1074 }); 1361 });
1075 $::BIND_EDITOR->show; 1362 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide; 1363 $SETUP_DIALOG->hide;
1364 0
1077 }); 1365 });
1078 1366
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1367 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1368 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 } 1369 }
1082 } 1370 }
1083 }; 1371 };
1084 1372
1085 my $vb = new CFClient::UI::VBox; 1373 my $vb = new CFClient::UI::VBox;
1374 $vb->add (my $hb = new CFClient::UI::HBox);
1375 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1376 $hb->add (new CFClient::UI::CheckBox
1377 expand => 1,
1378 state => $CFG->{shift_fire_stop},
1379 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1380 on_changed => sub {
1381 my ($cbox, $value) = @_;
1382 $CFG->{shift_fire_stop} = $value;
1383 0
1384 });
1385
1086 $vb->add ($binding_list); 1386 $vb->add ($binding_list);
1087 $vb->add (my $hb = new CFClient::UI::HBox); 1387 $vb->add (my $hb = new CFClient::UI::HBox);
1088 1388
1089 $hb->add (new CFClient::UI::Button 1389 $hb->add (new CFClient::UI::Button
1090 text => "record new", 1390 text => "record new",
… …
1092 tooltip => "This button opens the binding editor with an empty binding.", 1392 tooltip => "This button opens the binding editor with an empty binding.",
1093 on_activate => sub { 1393 on_activate => sub {
1094 $::BIND_EDITOR->set_binding (undef, undef, [], 1394 $::BIND_EDITOR->set_binding (undef, undef, [],
1095 sub { 1395 sub {
1096 my ($mod, $sym, $cmds) = @_; 1396 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1397 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1098 $refresh->(); 1398 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1399 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show; 1400 $SETUP_DIALOG->show;
1101 }, 1401 },
1102 sub { 1402 sub {
… …
1104 $SETUP_DIALOG->show; 1404 $SETUP_DIALOG->show;
1105 }, 1405 },
1106 ); 1406 );
1107 $SETUP_DIALOG->hide; 1407 $SETUP_DIALOG->hide;
1108 $::BIND_EDITOR->show; 1408 $::BIND_EDITOR->show;
1409 0
1109 }, 1410 },
1110 ); 1411 );
1111 1412
1112 $hb->add (new CFClient::UI::Button 1413 $hb->add (new CFClient::UI::Button
1113 text => "close", 1414 text => "close",
1114 tooltip => "Closes the binding window", 1415 tooltip => "Closes the binding window",
1115 expand => 1, 1416 expand => 1,
1116 on_activate => sub { 1417 on_activate => sub {
1117 $SETUP_DIALOG->hide; 1418 $SETUP_DIALOG->hide;
1419 0
1118 } 1420 }
1119 ); 1421 );
1120 1422
1121 $refresh->(); 1423 $refresh->();
1122 1424
1123 $vb 1425 $vb
1124} 1426}
1125 1427
1126sub make_help_window { 1428sub help_window {
1127 my $win = new CFClient::UI::FancyFrame 1429 my $win = new CFClient::UI::FancyFrame
1128 x => 'center', 1430 x => 'center',
1129 y => 'center', 1431 y => 'center',
1432 z => 2,
1130 name => 'doc_browser', 1433 name => 'doc_browser',
1131 force_w => int $WIDTH * 7/8, 1434 force_w => int $WIDTH * 7/8,
1132 force_h => int $HEIGHT * 7/8, 1435 force_h => int $HEIGHT * 7/8,
1133 title => "Documentation"; 1436 title => "Documentation";
1134 1437
1135 $win->add (my $vbox = new CFClient::UI::VBox); 1438 $win->add (my $vbox = new CFClient::UI::VBox);
1136 1439
1137 $vbox->add (my $buttons = new CFClient::UI::HBox); 1440 $vbox->add (my $buttons = new CFClient::UI::HBox);
1138 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1441 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1442 expand => 1, fontsize => 0.8, padding_x => 4);
1139 1443
1140 for ( 1444 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1445 $buttons->add (my $combo = new CFClient::UI::Combobox
1446 value => undef,
1447 options => [
1141 [intro => "Introduction"], 1448 [intro => "Introduction"],
1142 [manual => "Manual"], 1449 [manual => "Main Manual"],
1450 [skill_help => "Skill Reference"],
1451 [command_help => "Command Reference"],
1143 [command_help => "Commands"], 1452 [dmcommand_help => "DM Commands"],
1144 [skill_help => "Skills"], 1453 [COPYING => "License Terms"],
1145 ) { 1454 ],
1146 my ($pod, $label) = @$_; 1455 on_changed => sub {
1456 my ($self, $pod) = @_;
1147 1457
1148 $buttons->add (new CFClient::UI::Button 1458 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1149 text => $label, 1459 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1150 on_activate => sub {
1151 my $parser = new Pod::POM;
1152 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1153 1460
1154 $viewer->clear; 1461 $viewer->clear;
1462
1463# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1464# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1465# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1466# ]);#d#
1155 1467
1156 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1468 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157 for @{ CFClient::pod_to_pango_list $pom }; 1469 for @$pom;
1158 1470
1159 $viewer->set_offset (0); 1471 $viewer->set_offset (0);
1472
1160 }, 1473 0
1474 },
1475 on_visibility_change => sub {
1476 my ($self, $visible) = @_;
1477 return unless $visible;
1478 return if $self->{value};
1479 $self->set_value ("intro");
1480 0
1481 },
1161 ); 1482 );
1162 }
1163
1164 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1165 1483
1166 $win 1484 $win
1167} 1485}
1168 1486
1169sub sdl_init { 1487sub sdl_init {
… …
1206 z => 100, 1524 z => 100,
1207 force_x => "max", 1525 force_x => "max",
1208 force_y => 0; 1526 force_y => 0;
1209 $DEBUG_STATUS->show; 1527 $DEBUG_STATUS->show;
1210 1528
1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1529 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1212 1530
1213 $STATUSBOX = new CFClient::UI::Statusbox; 1531 $STATUSBOX = new CFClient::UI::Statusbox;
1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1532 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1215 1533
1216 (new CFClient::UI::Frame 1534 (new CFClient::UI::Frame
… …
1236 $MAPWIDGET->connect (activate_console => sub { 1554 $MAPWIDGET->connect (activate_console => sub {
1237 my ($mapwidget, $preset) = @_; 1555 my ($mapwidget, $preset) = @_;
1238 1556
1239 if ($CONSOLE) { 1557 if ($CONSOLE) {
1240 $CONSOLE->{input}->{auto_activated} = 1; 1558 $CONSOLE->{input}->{auto_activated} = 1;
1241 $CONSOLE->{input}->focus_in; 1559 $CONSOLE->{input}->grab_focus;
1242 1560
1243 if ($preset && $CONSOLE->{input}->get_text eq '') { 1561 if ($preset && $CONSOLE->{input}->get_text eq '') {
1244 $CONSOLE->{input}->set_text ($preset); 1562 $CONSOLE->{input}->set_text ($preset);
1245 } 1563 }
1246 } 1564 }
1247 }); 1565 });
1248 $MAPWIDGET->show; 1566 $MAPWIDGET->show;
1249 $MAPWIDGET->focus_in; 1567 $MAPWIDGET->grab_focus;
1250 1568
1251 $LOGVIEW = new CFClient::UI::TextView 1569 $LOGVIEW = new CFClient::UI::TextScroller
1252 expand => 1, 1570 expand => 1,
1253 font => $FONT_FIXED, 1571 font => $FONT_FIXED,
1254 fontsize => $::CFG->{log_fontsize}, 1572 fontsize => $::CFG->{log_fontsize},
1573 indent => -4,
1255 can_hover => 1, 1574 can_hover => 1,
1256 can_events => 1, 1575 can_events => 1,
1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1576 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258 ; 1577 ;
1259 1578
… …
1263 x => 'center', 1582 x => 'center',
1264 y => 'center', 1583 y => 'center',
1265 z => 2, 1584 z => 2,
1266 force_w => $::WIDTH * 0.6, 1585 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6, 1586 force_h => $::HEIGHT * 0.6,
1587 has_close_button => 1,
1268 ; 1588 ;
1269 1589
1590 $METASERVER = metaserver_dialog;
1591
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1592 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1593 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 1594
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1595 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options."); 1596 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1597 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1598 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1599 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1600 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1601 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music."); 1602 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1603 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings." 1604 "Lets you define, edit and delete key bindings."
1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1605 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you " 1606 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1607 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the " 1608 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes"); 1609 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1610 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1611 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1612 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1613 "Some debuggin' options. Do not ask.");
1290 1614
1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1615 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292 1616
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1617 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1618 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295 1619
1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1620 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1621 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298 1622
1299 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1623 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1300 1624
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1625 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1626 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1627 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1628 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1629 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306 1630
1307 $BUTTONBAR->add (new CFClient::UI::Button 1631 $BUTTONBAR->add (new CFClient::UI::Button
1308 text => "Save Config", 1632 text => "Save Config",
1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1633 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310 on_activate => sub { 1634 on_activate => sub {
1311 $::CFG->{layout} = CFClient::UI::get_layout; 1635 $::CFG->{layout} = CFClient::UI::get_layout;
1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1636 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313 status "Configuration Saved"; 1637 status "Configuration Saved";
1638 0
1314 }, 1639 },
1315 ); 1640 );
1316 1641
1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1642 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318 tooltip => "View Documentation"); 1643 tooltip => "View Documentation");
1319 1644
1320 $BUTTONBAR->add (new CFClient::UI::Button 1645 $BUTTONBAR->add (new CFClient::UI::Button
1321 text => "Quit", 1646 text => "Quit",
1322 tooltip => "Terminates the program", 1647 tooltip => "Terminates the program",
… …
1324 if ($CONN) { 1649 if ($CONN) {
1325 open_quit_dialog; 1650 open_quit_dialog;
1326 } else { 1651 } else {
1327 exit; 1652 exit;
1328 } 1653 }
1654 0
1329 }, 1655 },
1330 ); 1656 );
1331 1657
1332 $BUTTONBAR->show; 1658 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show; 1659 $SETUP_DIALOG->show;
… …
1335 1661
1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1662 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337} 1663}
1338 1664
1339sub video_shutdown { 1665sub video_shutdown {
1666 CFClient::OpenGL::shutdown;
1667
1340 undef $SDL_ACTIVE; 1668 undef $SDL_ACTIVE;
1341} 1669}
1342 1670
1343my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1671my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344my $bgmusic;#TODO#hack#d# 1672my $bgmusic;#TODO#hack#d#
… …
1560 1888
1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1889 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562 CFClient::UI::set_layout ($::CFG->{layout}); 1890 CFClient::UI::set_layout ($::CFG->{layout});
1563 1891
1564 my %DEF_CFG = ( 1892 my %DEF_CFG = (
1565 sdl_mode => 0, 1893 sdl_mode => 0,
1566 width => 640, 1894 width => 640,
1567 height => 480, 1895 height => 480,
1568 fullscreen => 0, 1896 fullscreen => 0,
1569 fast => 0, 1897 fast => 0,
1570 map_scale => 1, 1898 map_scale => 1,
1571 fow_enable => 1, 1899 fow_enable => 1,
1572 fow_intensity => 0.45, 1900 fow_intensity => 0.45,
1573 fow_smooth => 0, 1901 fow_smooth => 0,
1574 gui_fontsize => 1, 1902 gui_fontsize => 1,
1575 log_fontsize => 1, 1903 log_fontsize => 0.7,
1576 gauge_fontsize=> 1, 1904 gauge_fontsize => 1,
1577 gauge_size => 0.35, 1905 gauge_size => 0.35,
1578 stat_fontsize => 1, 1906 stat_fontsize => 0.7,
1579 mapsize => 100, 1907 mapsize => 100,
1580 host => "crossfire.schmorp.de",
1581 say_command => 'say', 1908 say_command => 'say',
1582 audio_enable => 1, 1909 audio_enable => 1,
1583 bgm_enable => 1, 1910 bgm_enable => 1,
1584 bgm_volume => 0.25, 1911 bgm_volume => 0.25,
1585 face_prefetch => 0, 1912 face_prefetch => 0,
1586 output_sync => 1, 1913 output_sync => 1,
1587 output_count => 1, 1914 output_count => 1,
1915 pickup => 0,
1916 default => "profile", # default profile
1917 );
1588 ); 1918
1589
1590 while (my ($k, $v) = each %DEF_CFG) { 1919 while (my ($k, $v) = each %DEF_CFG) {
1591 $CFG->{$k} = $v unless exists $CFG->{$k}; 1920 $CFG->{$k} = $v unless exists $CFG->{$k};
1592 } 1921 }
1922
1923 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1593 1924
1594 sdl_init; 1925 sdl_init;
1595 1926
1596 @SDL_MODES = reverse 1927 @SDL_MODES = reverse
1597 grep $_->[0] >= 640 && $_->[1] >= 480, 1928 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1639 video_init; 1970 video_init;
1640 audio_init; 1971 audio_init;
1641} 1972}
1642 1973
1643Event::loop; 1974Event::loop;
1975#CFClient::SDL_Quit;
1976#CFClient::_exit 0;
1644 1977
1645END { CFClient::SDL_Quit } 1978END { CFClient::SDL_Quit }
1646 1979
1647=head1 NAME 1980=head1 NAME
1648 1981

Diff Legend

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