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.46 by elmex, Fri Jun 2 18:46:16 2006 UTC vs.
Revision 1.94 by root, Sun Jul 16 20:04:08 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" };
45$SIG{PIPE} = 'IGNORE';
43 46
44$Event::DIED = sub { 47$Event::DIED = sub {
45 # TODO: display dialog box or so 48 # TODO: display dialog box or so
49 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 50 CFClient::error $_[1];
47}; 51};
48 52
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 53#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 54
… …
82our $CONSOLE; 86our $CONSOLE;
83our $METASERVER; 87our $METASERVER;
84our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 89our $QUIT_DIALOG;
86our $HOST_ENTRY; 90our $HOST_ENTRY;
87our $SERVER_SETUP; 91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
93our $SERVER_INFO;
88 94
95our $SETUP_DIALOG;
96our $SETUP_NOTEBOOK;
97our $SETUP_SERVER;
98our $SETUP_KEYBOARD;
99
100our $PL_NOTEBOOK;
101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SPELL_PAGE;
106
107our $HELP_WINDOW;
108our $MESSAGE_WINDOW;
89our $FLOORBOX; 109our $FLOORBOX;
90our $GAUGES; 110our $GAUGES;
91our $STATWIDS; 111our $STATWIDS;
92 112
93our $SDL_ACTIVE; 113our $SDL_ACTIVE;
… …
99 119
100our $ALT_ENTER_MESSAGE; 120our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 121our $STATUSBOX;
102our $DEBUG_STATUS; 122our $DEBUG_STATUS;
103 123
104our $INV_WINDOW;
105our $INV; 124our $INV;
106our $INVR; 125our $INVR;
107our $INV_RIGHT_HB; 126our $INV_RIGHT_HB;
108 127
109our $BIND_WINDOW;
110our $BIND_EDITOR; 128our $BIND_EDITOR;
129our $BIND_UPD_CB;
111 130
112our $SPELL_LIST;
113our $PICKUP_CFG; 131our $PICKUP_CFG;
114 132
115sub status { 133sub status {
116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 134 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
117} 135}
118 136
119sub debug { 137sub debug {
120 $DEBUG_STATUS->set_text ($_[0]); 138 $DEBUG_STATUS->set_text ($_[0]);
121} 139}
122 140
141sub destroy_query_dialog {
142 (delete $_[0]{query_dialog})->destroy
143 if $_[0]{query_dialog};
144}
145
146# server query dialog
147sub server_query {
148 my ($conn, $flags, $prompt) = @_;
149
150 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
151 x => "center",
152 y => "center",
153 title => "Server Query",
154 child => my $vbox = new CFClient::UI::VBox,
155 ;
156
157 my @dialog = my $label = new CFClient::UI::Label
158 max_w => $::WIDTH * 0.4,
159 ellipsise => 0,
160 text => $prompt;
161
162 if ($flags & CS_QUERY_YESNO) {
163 push @dialog, my $hbox = new CFClient::UI::HBox;
164
165 $hbox->add (new CFClient::UI::Button
166 text => "No",
167 on_activate => sub {
168 $conn->send ("reply n");
169 $dialog->destroy;
170 0
171 }
172 );
173 $hbox->add (new CFClient::UI::Button
174 text => "Yes",
175 on_activate => sub {
176 $conn->send ("reply y");
177 destroy_query_dialog $conn;
178 0
179 },
180 );
181
182 $dialog->grab_focus;
183
184 } elsif ($flags & CS_QUERY_SINGLECHAR) {
185 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
186
187 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
188 $MESSAGE_WINDOW->show;
189
190 unshift @dialog, new CFClient::UI::Label
191 max_w => $::WIDTH * 0.4,
192 ellipsise => 0,
193 markup => "\nOr use your keyboard:\n";
194
195 unshift @dialog, my $table = new CFClient::UI::Table;
196
197 $table->add (0, 0, new CFClient::UI::Button
198 text => "Next Race",
199 on_activate => sub {
200 $conn->send ("reply n");
201 destroy_query_dialog $conn;
202 0
203 },
204 );
205 $table->add (2, 0, new CFClient::UI::Button
206 text => "Accept",
207 on_activate => sub {
208 $conn->send ("reply d");
209 destroy_query_dialog $conn;
210 0
211 },
212 );
213
214 unshift @dialog, new CFClient::UI::Label
215 max_w => $::WIDTH * 0.4,
216 ellipsise => 0,
217 markup =>
218 "<big><b>Character Creation: Race</b></big>\n\n"
219 . "Look at the <b>Messages</b> window to see a description of this race "
220 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
221 . "and the center of the screen to see how this race looks like "
222 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
223 . "You can look at another race, or accept this race (you will come back to this race eventually, "
224 . "so you can take your time making this important choice."
225 ;
226
227 } elsif ($prompt =~ /roll new stats/) {
228 if (my $stat = delete $conn->{stat_change_with}) {
229 $conn->send ("reply $stat");
230 destroy_query_dialog $conn;
231 return;
232 }
233
234 $STATS_PAGE->show;
235 $MESSAGE_WINDOW->hide;
236
237 unshift @dialog, new CFClient::UI::Label
238 max_w => $::WIDTH * 0.4,
239 ellipsise => 0,
240 markup => "\nOr use your keyboard:\n";
241
242 unshift @dialog, my $table = new CFClient::UI::Table;
243
244 # left: re-roll
245 $table->add (0, 0, new CFClient::UI::Button
246 text => "Roll Again",
247 on_activate => sub {
248 $conn->send ("reply y");
249 destroy_query_dialog $conn;
250 0
251 },
252 );
253
254 # center: swap stats
255 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
256 value => $_,
257 options => [
258 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
259 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
260 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
261 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
262 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
263 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
264 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
265 ],
266 ), 1 .. 2;
267
268 $table->add (2, 0, new CFClient::UI::Button
269 text => "Swap Stats",
270 on_activate => sub {
271 $conn->{stat_change_with} = $sw2->{value};
272 $conn->send ("reply $sw1->{value}");
273 destroy_query_dialog $conn;
274 0
275 },
276 );
277 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
278
279 # right: accept
280 $table->add (4, 0, new CFClient::UI::Button
281 text => "Accept",
282 on_activate => sub {
283 $conn->send ("reply n");
284 $STATS_PAGE->hide;
285 destroy_query_dialog $conn;
286 0
287 },
288 );
289
290 unshift @dialog, new CFClient::UI::Label
291 max_w => $::WIDTH * 0.4,
292 ellipsise => 0,
293 markup =>
294 "<big><b>Character Creation: Stats</b></big>\n\n"
295 . "Look at the <b>Stats</b> window to see your basic stats "
296 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
297 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
298 . "Race selection will influence those values later on."
299 ;
300 }
301
302 push @dialog, my $entry = new CFClient::UI::Entry
303 on_changed => sub {
304 $conn->send ("reply $_[1]");
305 destroy_query_dialog $conn;
306 0
307 },
308 ;
309
310 $entry->grab_focus;
311
312 } else {
313 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
314
315 push @dialog, my $entry = new CFClient::UI::Entry
316 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
317 on_activate => sub {
318 $conn->send ("reply $_[1]");
319 destroy_query_dialog $conn;
320 0
321 },
322 ;
323
324 $entry->grab_focus;
325 }
326
327 $vbox->add (@dialog);
328 $dialog->show;
329}
330
123sub start_game { 331sub start_game {
124 status "logging in..."; 332 status "logging in...";
125 333
126 $LOGIN_BUTTON->set_text ("Logout"); 334 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide; 335 $SETUP_DIALOG->hide;
128 336
129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 337 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
130 338
131 my ($host, $port) = split /:/, $CFG->{host}; 339 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
132 340
133 $MAP = new CFClient::Map $mapsize, $mapsize; 341 $MAP = new CFClient::Map $mapsize, $mapsize;
134 342
135 $CONN = eval { 343 $CONN = eval {
136 new CFClient::Protocol 344 new CFClient::Protocol
137 host => $host, 345 host => $host,
138 port => $port || 13327, 346 port => $port || 13327,
139 user => $CFG->{user}, 347 user => $CFG->{profile}{default}{user},
140 pass => $CFG->{password}, 348 pass => $CFG->{profile}{default}{password},
141 mapw => $mapsize, 349 mapw => $mapsize,
142 maph => $mapsize, 350 maph => $mapsize,
143 351
144 map_widget => $MAPWIDGET, 352 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW, 353 logview => $LOGVIEW,
146 statusbox => $STATUSBOX, 354 statusbox => $STATUSBOX,
147 map => $MAP, 355 map => $MAP,
148 mapmap => $MAPMAP, 356 mapmap => $MAPMAP,
357 query => \&server_query,
149 358
150 sound_play => sub { 359 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_; 360 my ($x, $y, $soundnum, $type) = @_;
152 361
153 $SDL_MIXER 362 $SDL_MIXER
… …
170 } 379 }
171} 380}
172 381
173sub stop_game { 382sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login"); 383 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show; 384 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
385 $SETUP_DIALOG->show;
176 $INV_WINDOW->hide; 386 $PL_WINDOW->hide;
177 $LOGVIEW->hide; 387 $SPELL_PAGE->clear_spells;
178 388
179 return unless $CONN; 389 return unless $CONN;
180 390
181 status "connection closed"; 391 status "connection closed";
182 392
393 destroy_query_dialog $CONN;
183 $CONN->destroy; 394 $CONN->destroy;
184 $CONN = 0; # false, does not autovivify 395 $CONN = 0; # false, does not autovivify
185}
186 396
187sub client_setup { 397 undef $MAP;
188 my $dialog = new CFClient::UI::FancyFrame 398}
189 x => 1, 399
190 y => $HEIGHT * (1/8), 400sub graphics_setup {
191 name => "client_setup",
192 title => "Client Setup",
193 child => (my $vbox = new CFClient::UI::VBox); 401 my $vbox = new CFClient::UI::VBox;
194 402
195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 403 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
196 404
197 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 405 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 406 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
209 $mode_slider->emit (changed => $mode_slider->{range}[0]); 417 $mode_slider->emit (changed => $mode_slider->{range}[0]);
210 418
211 my $row = 1; 419 my $row = 1;
212 420
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 421 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 422 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
215 state => $CFG->{fullscreen}, 423 state => $CFG->{fullscreen},
216 tooltip => "Bring the client into fullscreen mode.", 424 tooltip => "Bring the client into fullscreen mode.",
217 on_changed => sub { 425 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fullscreen} = $value;
220 }
221 ); 426 );
222 427
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fast}, 430 state => $CFG->{fast},
226 tooltip => "Lower the visual quality considerably to speed up rendering.", 431 tooltip => "Lower the visual quality considerably to speed up rendering.",
227 on_changed => sub { 432 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fast} = $value;
230 }
231 ); 433 );
232 434
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 435 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
234 $table->add (1, $row++, new CFClient::UI::Slider 436 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 437 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 438 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
237 on_changed => sub { 439 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{map_scale} = 2 ** $value;
240 }
241 ); 440 );
242 441
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 442 $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 443 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_enable}, 444 state => $CFG->{fow_enable},
246 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 445 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
247 on_changed => sub { 446 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_enable} = $value;
250 }
251 ); 447 );
252 448
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 449 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
254 $table->add (1, $row++, new CFClient::UI::Slider 450 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 451 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.", 452 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 { 453 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
258 my ($self, $value) = @_;
259 $CFG->{fow_intensity} = $value;
260 }
261 ); 454 );
262 455
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
264 $table->add (1, $row++, new CFClient::UI::CheckBox 457 $table->add (1, $row++, new CFClient::UI::CheckBox
265 state => $CFG->{fow_smooth}, 458 state => $CFG->{fow_smooth},
266 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 459 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
267 on_changed => sub { 460 on_changed => sub {
268 my ($self, $value) = @_; 461 my ($self, $value) = @_;
269 $CFG->{fow_smooth} = $value; 462 $CFG->{fow_smooth} = $value;
270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 463 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
464 0
271 } 465 }
272 ); 466 );
273 467
274 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 468 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
275 $table->add (1, $row++, new CFClient::UI::Slider 469 $table->add (1, $row++, new CFClient::UI::Slider
276 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 470 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.", 471 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] }, 472 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
279 ); 473 );
280 474
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 475 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 477 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.", 478 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]) }, 479 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
286 );
287
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
289
290 $table->add (1, $row++, new CFClient::UI::Slider
291 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.",
293 on_changed => sub {
294 $CFG->{stat_fontsize} = $_[1];
295 &set_stats_window_fontsize;
296 }
297 ); 480 );
298 481
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
300 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 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.", 485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
303 on_changed => sub { 486 on_changed => sub {
304 $CFG->{gauge_fontsize} = $_[1]; 487 $CFG->{gauge_fontsize} = $_[1];
305 &set_gauge_window_fontsize; 488 &set_gauge_window_fontsize;
489 0
306 } 490 }
307 ); 491 );
308 492
309 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 493 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
310 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFClient::UI::Slider
311 range => [$CFG->{gauge_size}, 0.2, 0.8], 495 range => [$CFG->{gauge_size}, 0.2, 0.8],
312 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 496 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
313 on_changed => sub { 497 on_changed => sub {
314 $CFG->{gauge_size} = $_[1]; 498 $CFG->{gauge_size} = $_[1];
315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0
316 } 501 }
317 ); 502 );
318 503
319 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
320 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
321 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
322 on_activate => sub { 507 on_activate => sub {
323 video_shutdown (); 508 video_shutdown ();
324 video_init (); 509 video_init ();
510 0
325 } 511 }
326 ); 512 );
513
514 $vbox
515}
516
517sub audio_setup {
518 my $vbox = new CFClient::UI::VBox;
519
520 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
521
522 my $row = 0;
327 523
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 524 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
329 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
330 state => $CFG->{audio_enable}, 526 state => $CFG->{audio_enable},
331 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 527 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
332 on_changed => sub { 528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
333 $CFG->{audio_enable} = $_[1];
334 }
335 ); 529 );
336# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 530# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
337# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 531# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
338# $CFG->{effects_volume} = $_[1]; 532# $CFG->{effects_volume} = $_[1];
339# }); 533# });
340 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
341 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
342 $hbox->add (new CFClient::UI::CheckBox 536 $hbox->add (new CFClient::UI::CheckBox
343 expand => 1, state => $CFG->{bgm_enable}, 537 expand => 1, state => $CFG->{bgm_enable},
344 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 538 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
345 on_changed => sub { 539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
346 $CFG->{bgm_enable} = $_[1];
347 }
348 ); 540 );
349 $hbox->add (new CFClient::UI::Slider 541 $hbox->add (new CFClient::UI::Slider
350 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
351 tooltip => "The volume of the background music. Changes are instant.", 543 tooltip => "The volume of the background music. Changes are instant.",
352 on_changed => sub { 544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
353 $CFG->{bgm_volume} = $_[1];
354 CFClient::MixMusic::volume $_[1] * 128;
355 }
356 ); 545 );
357 546
358 $table->add (1, $row++, new CFClient::UI::Button 547 $table->add (1, $row++, new CFClient::UI::Button
359 expand => 1, align => 0, text => "Apply", 548 expand => 1, align => 0, text => "Apply",
360 tooltip => "Apply the audio settings", 549 tooltip => "Apply the audio settings",
361 on_activate => sub { 550 on_activate => sub {
362 audio_shutdown (); 551 audio_shutdown ();
363 audio_init (); 552 audio_init ();
553 0
364 } 554 }
365 ); 555 );
366 556
367 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 557 $vbox
368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
369 text => $CFG->{say_command},
370 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
371 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
373 on_changed => sub {
374 my ($self, $value) = @_;
375 $CFG->{say_command} = $value;
376 }
377 );
378
379 $dialog
380}
381
382sub set_stats_window_fontsize {
383 for (values %{$STATWIDS}) {
384 $_->set_fontsize ($::CFG->{stat_fontsize});
385 }
386} 558}
387 559
388sub set_gauge_window_fontsize { 560sub set_gauge_window_fontsize {
389 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 561 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
390 $_->set_fontsize ($::CFG->{gauge_fontsize}); 562 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
442 &set_gauge_window_fontsize; 614 &set_gauge_window_fontsize;
443 615
444 $win 616 $win
445} 617}
446 618
619sub debug_setup {
620 my $table = new CFClient::UI::Table;
447 621
622 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
623 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
624 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
625 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
626 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
627 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
628 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
629 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
630
631 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
632
633 for my $x (0..2) {
634 for my $y (0 .. 2) {
635 $table->add ($x + 3, $y,
636 new CFClient::UI::Entry
637 text => $default_smooth[$x * 3 + $y],
638 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
639 );
640 }
641 }
642
643
644 $table
645}
646
448sub make_stats_window { 647sub stats_window {
449 my $tgw = new CFClient::UI::FancyFrame 648 my $vb = new CFClient::UI::VBox;
450 y => $HEIGHT * (2/8),
451 x => "max",
452 title => "Stats",
453 name => "stats_window";
454 649
455 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
456 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 650 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
457 can_hover => 1, can_events => 1, 651 can_hover => 1, can_events => 1,
458 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 652 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
459 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 653 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
460 can_hover => 1, can_events => 1, 654 can_hover => 1, can_events => 1,
… …
484 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 678 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
485 679
486 [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."], 680 [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."],
487 [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."], 681 [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."],
488 [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."], 682 [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."],
489 [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."], 683 [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."],
490 [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."], 684 [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."],
491 [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."], 685 [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."],
492 ) { 686 ) {
493 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 687 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
494 688
… …
496 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 690 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
497 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 691 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
498 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 692 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
499 } 693 }
500 694
501 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
502 696
503 my $row = 0; 697 my $row = 0;
504 my $col = 0; 698 my $col = 0;
505 699
506 my %resist_names = ( 700 my %resist_names = (
701 slow => ["Slow",
507 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 702 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
703 holyw => ["Holy Word",
508 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 704 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
705 conf => ["Confusion",
509 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 706 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
707 fire => ["Fire",
510 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 708 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
709 depl => ["Depletion",
511 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 710 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
711 magic => ["Magic",
512 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 712 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
713 drain => ["Draining",
513 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 714 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
715 acid => ["Acid",
514 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 716 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
717 pois => ["Poison",
515 pois => "<b>Poison</b> (resistance to getting poisoned)", 718 "<b>Poison</b> (resistance to getting poisoned)"],
719 para => ["Paralysation",
516 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 720 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
721 deat => ["Death",
517 deat => "<b>Death</b> (resistance against death spells)", 722 "<b>Death</b> (resistance against death spells)"],
518 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 723 phys => ["Physical",
724 "<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.)"],
725 blind => ["Blind",
519 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 726 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
727 fear => ["Fear",
520 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)", 728 "<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)"],
729 tund => ["Turn undead",
521 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 730 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
731 elec => ["Electricity",
522 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 732 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
733 cold => ["Cold",
523 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 734 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
735 ghit => ["Ghost hit",
524 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 736 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
525 ); 737 );
526 for (qw/slow holyw conf fire depl magic 738 for (qw/slow holyw conf fire depl magic
527 drain acid pois para deat phys 739 drain acid pois para deat phys
528 blind fear tund elec cold ghit/) 740 blind fear tund elec cold ghit/)
529 { 741 {
… …
534 template => "-100%", 746 template => "-100%",
535 align => +1, 747 align => +1,
536 valign => 0, 748 valign => 0,
537 can_events => 1, 749 can_events => 1,
538 can_hover => 1, 750 can_hover => 1,
539 tooltip => $resist_names{$_}, 751 tooltip => $resist_names{$_}->[1],
540 ); 752 );
541 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
542 font => $FONT_FIXED, 754 font => $FONT_FIXED,
543 can_hover => 1, 755 can_hover => 1,
544 can_events => 1, 756 can_events => 1,
545 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
546 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_}->[1],
759 );
760 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
761 text => $resist_names{$_}->[0],
762 font => $FONT_FIXED,
763 can_hover => 1,
764 can_events => 1,
765 tooltip => $resist_names{$_}->[1],
547 ); 766 );
548 767
549 $row++; 768 $row++;
550 if ($row % 6 == 0) { 769 if ($row % 6 == 0) {
551 $col += 2; 770 $col += 3;
552 $row = 0; 771 $row = 0;
553 } 772 }
554 } 773 }
555 774
556 &set_stats_window_fontsize;
557 update_stats_window ({}); 775 update_stats_window ({});
558 776
559 $tgw 777 $vb
560} 778}
561 779
780sub skill_window {
781 my ($self) = @_;
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
783}
784
562sub formsep { 785sub formsep($) {
563 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
564} 787}
565 788
566sub update_stats_window { 789sub update_stats_window {
567 my ($stats) = @_; 790 my ($stats) = @_;
568 791
… …
598 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
599 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
600 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
601 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
602 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
603 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
604 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
605 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 828 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
606 829
607 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 830 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
608 831
609 # TODO: replace by CS_STAT_RES_xxx constants
610 my %tbl = ( 832 my %tbl = (
611 phys => 100, 833 phys => CS_STAT_RES_PHYS,
612 magic => 101, 834 magic => CS_STAT_RES_MAG,
613 fire => 102, 835 fire => CS_STAT_RES_FIRE,
614 elec => 103, 836 elec => CS_STAT_RES_ELEC,
615 cold => 104, 837 cold => CS_STAT_RES_COLD,
616 conf => 105, 838 conf => CS_STAT_RES_CONF,
617 acid => 106, 839 acid => CS_STAT_RES_ACID,
618 drain => 107, 840 drain => CS_STAT_RES_DRAIN,
619 ghit => 108, 841 ghit => CS_STAT_RES_GHOSTHIT,
620 pois => 109, 842 pois => CS_STAT_RES_POISON,
621 slow => 110, 843 slow => CS_STAT_RES_SLOW,
622 para => 111, 844 para => CS_STAT_RES_PARA,
623 tund => 112, 845 tund => CS_STAT_TURN_UNDEAD,
624 fear => 113, 846 fear => CS_STAT_RES_FEAR,
625 depl => 113, 847 depl => CS_STAT_RES_DEPLETE,
626 deat => 115, 848 deat => CS_STAT_RES_DEATH,
627 holyw => 116, 849 holyw => CS_STAT_RES_HOLYWORD,
628 blind => 117, 850 blind => CS_STAT_RES_BLIND,
629 ); 851 );
852
853 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
854 my $sktbl = $STATWIDS->{_skill_tbl};
855 $sktbl->clear;
856
857 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
858 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
859 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
860
861 my @skills;
862
863 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
864 push @skills, [$i, $::CONN->{skill_info}{$i}];
865 }
866
867 my $y = 1;
868 for (sort { $a->[1] cmp $b->[1] } @skills) {
869 my ($idx, $name) = @$_;
870
871 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
872 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
874 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
875 }
876 }
877
878 $STATWIDS->{_skill_tbl_init} = 1;
879 }
880
881 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
882 if (exists $stats->{$i}) {
883 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
884 if $STATWIDS->{"sk_xp_$i"};
885 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
886 if $STATWIDS->{"sk_lvl_$i"};
887 }
888 }
630 889
631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
632 for keys %tbl; 891 for keys %tbl;
633} 892}
634 893
635my $METASERVER_ATIME; 894my $METASERVER_ATIME;
636 895
637sub update_metaserver { 896sub update_metaserver {
897 my ($metaserver_dialog) = @_;
898
899 $METASERVER = $metaserver_dialog
900 if defined $metaserver_dialog;
901
638 return if $METASERVER_ATIME > time; 902 return if $METASERVER_ATIME > time;
639 $METASERVER_ATIME = time + 60; 903 $METASERVER_ATIME = time + 60;
640 904
641 my $table = $METASERVER->{table}; 905 my $table = $METASERVER->{table};
642 $table->clear; 906 $table->clear;
… …
663 927
664 utf8::decode $buf if utf8::valid $buf; 928 utf8::decode $buf if utf8::valid $buf;
665 929
666 $table->clear; 930 $table->clear;
667 931
932 my @tip = (
933 "The current number of users logged in on the server.",
934 "The hostname of the server.",
935 "The time this server has been running without being restarted.",
936 "The server software version - a '+' indicates a Crossfire+ server.",
937 "Short information about this server provided by its admins.",
938 );
668 my @col = qw(Use #Users Host Uptime Version Description); 939 my @col = qw(#Users Host Uptime Version Description);
669 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 940 $table->add ($_, 0, new CFClient::UI::Label
941 can_hover => 1, can_events => 1,
942 align => 0, fg => [1, 1, 0],
943 text => $col[$_], tooltip => $tip[$_])
670 for 0 .. $#col; 944 for 0 .. $#col;
671 945
672 my @align = qw(1 0 1 1 -1); 946 my @align = qw(1 0 1 1 -1);
673 947
674 my $y = 0; 948 my $y = 0;
675 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 949 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
692 966
693 $m = [$users, $host, $uptime, $version, $desc]; 967 $m = [$users, $host, $uptime, $version, $desc];
694 968
695 $y++; 969 $y++;
696 970
697 $table->add (0, $y, new CFClient::UI::VBox children => [ 971 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
698 (new CFClient::UI::Button text => "Use", on_activate => sub { 972 (new CFClient::UI::Button
973 text => "Use",
974 tooltip => "Put this server into the <b>Host:Port</b> field",
975 on_activate => sub {
699 $HOST_ENTRY->set_text ($CFG->{host} = $host); 976 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
700 $METASERVER->toggle_visibility; 977 $METASERVER->hide;
978 0
979 },
701 }), 980 ),
702 (new CFClient::UI::Empty expand => 1), 981 (new CFClient::UI::Empty expand => 1),
703 ]); 982 ]);
704 983
705 $table->add ($_ + 1, $y, new CFClient::UI::Label 984 $table->add ($_, $y, new CFClient::UI::Label
706 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 985 ellipsise => 0,
986 align => $align[$_],
987 text => $m->[$_],
988 tooltip => $tip[$_],
989 can_hover => 1,
990 can_events => 1,
991 fontsize => 0.8)
707 for 0 .. $#$m; 992 for 0 .. $#$m;
708 } 993 }
709 } 994 }
710 }); 995 });
711} 996}
712 997
713sub metaserver_dialog { 998sub metaserver_dialog {
999 my $vbox = new CFClient::UI::VBox;
1000 my $table = new CFClient::UI::Table;
1001 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1002
714 my $dialog = new CFClient::UI::FancyFrame 1003 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List", 1004 title => "Server List",
716 name => 'metaserver_dialog', 1005 name => 'metaserver_dialog',
717 x => 'center', 1006 x => 'center',
718 y => 'center', 1007 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox), 1008 z => 3,
1009 force_h => $::HEIGHT * 0.4,
1010 child => $vbox,
1011 has_close_button => 1,
1012 table => $table,
720 on_visibility_change => sub { 1013 on_visibility_change => sub {
721 update_metaserver if $_[1]; 1014 update_metaserver ($_[0]) if $_[1];
1015 0
722 }, 1016 },
723 ; 1017 ;
724 1018
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog 1019 $dialog
728} 1020}
729 1021
730sub server_setup { 1022sub server_setup {
731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
735 title => "Server Setup",
736 child => (my $vbox = new CFClient::UI::VBox), 1023 my $vbox = new CFClient::UI::VBox;
737 ;
738 1024
739 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1025 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1026 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
741 1027
742 { 1028 {
743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1029 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
744 1030
745 $vbox->add ( 1031 $vbox->add (
746 $HOST_ENTRY = new CFClient::UI::Entry 1032 $HOST_ENTRY = new CFClient::UI::Entry
747 expand => 1, 1033 expand => 1,
748 text => $CFG->{host}, 1034 text => $CFG->{profile}{default}{host},
749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1035 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
750 on_changed => sub { 1036 on_changed => sub {
751 my ($self, $value) = @_; 1037 my ($self, $value) = @_;
752 $CFG->{host} = $value; 1038 $CFG->{profile}{default}{host} = $value;
1039 0
753 } 1040 }
754 ); 1041 );
755
756 $METASERVER = metaserver_dialog;
757 1042
758 $vbox->add (new CFClient::UI::Button 1043 $vbox->add (new CFClient::UI::Button
759 expand => 1, 1044 expand => 1,
760 text => "Server List", 1045 text => "Server List",
761 other => $METASERVER, 1046 other => $METASERVER,
762 tooltip => "Show a list of available crossfire servers", 1047 tooltip => "Show a list of available crossfire servers",
763 on_activate => sub { $METASERVER->toggle_visibility }, 1048 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1049 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
764 ); 1050 );
765 } 1051 }
766 1052
767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1053 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
768 $table->add (1, 4, new CFClient::UI::Entry 1054 $table->add (1, 4, new CFClient::UI::Entry
769 text => $CFG->{user}, 1055 text => $CFG->{profile}{default}{user},
770 tooltip => "The name of your character on the server", 1056 tooltip => "The name of your character on the server",
771 on_changed => sub { 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
772 my ($self, $value) = @_;
773 $CFG->{user} = $value;
774 }
775 ); 1058 );
776 1059
777 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1060 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
778 $table->add (1, 5, new CFClient::UI::Entry 1061 $table->add (1, 5, new CFClient::UI::Entry
779 text => $CFG->{password}, 1062 text => $CFG->{profile}{default}{password},
780 hidden => 1, 1063 hidden => 1,
781 tooltip => "The password for your character", 1064 tooltip => "The password for your character",
782 on_changed => sub { 1065 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
783 my ($self, $value) = @_;
784 $CFG->{password} = $value;
785 }
786 ); 1066 );
787 1067
788 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1068 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
789 $table->add (1, 7, new CFClient::UI::Slider 1069 $table->add (1, 7, new CFClient::UI::Slider
790 force_w => 100, 1070 force_w => 100,
791 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1071 range => [$CFG->{mapsize}, 10, 100, 0, 1],
792 tooltip => "This is the size of the portion of the map update the server sends you. " 1072 tooltip => "This is the size of the portion of the map update the server sends you. "
793 . "If you set this to a high value you will be able to see further, " 1073 . "If you set this to a high value you will be able to see further, "
794 . "but you also increase bandwidth requirements and latency. " 1074 . "but you also increase bandwidth requirements and latency. "
795 . "This option is only used once at log-in.", 1075 . "This option is only used once at log-in.",
796 on_changed => sub { 1076 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
797 my ($self, $value) = @_;
798
799 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
800 },
801 ); 1077 );
802 1078
803 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1079 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
804 $table->add (1, 8, new CFClient::UI::CheckBox 1080 $table->add (1, 8, new CFClient::UI::CheckBox
805 state => $CFG->{face_prefetch}, 1081 state => $CFG->{face_prefetch},
… …
808 . "This might increase or create lag, but increases the chances " 1084 . "This might increase or create lag, but increases the chances "
809 . "of faces being ready for display when you encounter them. " 1085 . "of faces being ready for display when you encounter them. "
810 . "It also uses up server bandwidth on every connect, " 1086 . "It also uses up server bandwidth on every connect, "
811 . "so only set it if you really need to prefetch images. " 1087 . "so only set it if you really need to prefetch images. "
812 . "This option can be set and unset any time.", 1088 . "This option can be set and unset any time.",
813 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1089 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
814 ); 1090 );
815 1091
816 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1092 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
817 $table->add (1, 9, new CFClient::UI::Entry 1093 $table->add (1, 9, new CFClient::UI::Entry
818 text => $CFG->{output_count}, 1094 text => $CFG->{output_count},
819 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1095 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_count} = $_[1] }, 1096 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
821 ); 1097 );
822 1098
823 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1099 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
824 $table->add (1, 10, new CFClient::UI::Entry 1100 $table->add (1, 10, new CFClient::UI::Entry
825 text => $CFG->{output_sync}, 1101 text => $CFG->{output_sync},
826 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1102 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
827 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1103 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
828 ); 1104 );
829 1105
830 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1106 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
831 expand => 1, 1107 expand => 1,
832 align => 0, 1108 align => 0,
833 text => "Login", 1109 text => "Login",
834 on_activate => sub { 1110 on_activate => sub {
835 $CONN ? stop_game 1111 $CONN ? stop_game
836 : start_game; 1112 : start_game;
1113 0
837 }, 1114 },
838 ); 1115 );
839 1116
840 $dialog 1117 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1118 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1119 text => $CFG->{say_command},
1120 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1121 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1122 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1123 on_changed => sub {
1124 my ($self, $value) = @_;
1125 $CFG->{say_command} = $value;
1126 0
1127 }
1128 );
1129
1130 $vbox->add (new CFClient::UI::Label
1131 text => "Server Info",
1132 fontsize => 1.2,
1133 padding_y => 8,
1134 fg => [1, 1, 0, 1],
1135 );
1136
1137 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1138
1139 $vbox
841} 1140}
842 1141
843sub message_window { 1142sub message_window {
844 my $window = new CFClient::UI::FancyFrame 1143 my $window = new CFClient::UI::FancyFrame
845 name => "message_window", 1144 name => "message_window",
846 title => "Messages", 1145 title => "Messages",
847 border_bg => [1, 1, 1, 1], 1146 border_bg => [1, 1, 1, 1],
848 bg => [0, 0, 0, 0.75],
849 x => "max", 1147 x => "max",
850 y => 0, 1148 y => 0,
851 force_w => $::WIDTH / 3, 1149 force_w => $::WIDTH * 0.4,
852 force_h => $::HEIGHT / 5, 1150 force_h => $::HEIGHT * 0.5,
853 child => (my $vbox = new CFClient::UI::VBox); 1151 child => (my $vbox = new CFClient::UI::VBox),
1152 has_close_button => 1;
854 1153
855 $vbox->add ($LOGVIEW); 1154 $vbox->add ($LOGVIEW);
856 1155
857 $vbox->add (my $input = new CFClient::UI::Entry 1156 $vbox->add (my $input = new CFClient::UI::Entry
858 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1157 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
866 1165
867 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1166 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
868 $input->{refocus_map} = 1; 1167 $input->{refocus_map} = 1;
869 } 1168 }
870 delete $input->{auto_activated}; 1169 delete $input->{auto_activated};
1170
1171 0
871 }, 1172 },
872 on_activate => sub { 1173 on_activate => sub {
873 my ($input, $text) = @_; 1174 my ($input, $text) = @_;
874 $input->set_text (''); 1175 $input->set_text ('');
875 1176
… …
881 } 1182 }
882 if ($input->{refocus_map}) { 1183 if ($input->{refocus_map}) {
883 delete $input->{refocus_map}; 1184 delete $input->{refocus_map};
884 $MAPWIDGET->focus_in 1185 $MAPWIDGET->focus_in
885 } 1186 }
1187
1188 0
886 }, 1189 },
887 on_escape => sub { 1190 on_escape => sub {
888 $MAPWIDGET->focus_in 1191 $MAPWIDGET->grab_focus;
1192
1193 0
889 }, 1194 },
890 ); 1195 );
891 1196
892 $CONSOLE = { 1197 $CONSOLE = {
893 window => $window, 1198 window => $window,
… …
900sub open_quit_dialog { 1205sub open_quit_dialog {
901 unless ($QUIT_DIALOG) { 1206 unless ($QUIT_DIALOG) {
902 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1207 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center", 1208 x => "center",
904 y => "center", 1209 y => "center",
1210 z => 50,
905 title => "Really Quit?", 1211 title => "Really Quit?",
906 ; 1212 ;
907 1213
908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1214 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
909 1215
… …
914 ); 1220 );
915 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
916 $hb->add (new CFClient::UI::Button 1222 $hb->add (new CFClient::UI::Button
917 text => "Ok", 1223 text => "Ok",
918 expand => 1, 1224 expand => 1,
919 on_activate => sub { $QUIT_DIALOG->hide }, 1225 on_activate => sub { $QUIT_DIALOG->hide; 0 },
920 ); 1226 );
921 $hb->add (new CFClient::UI::Button 1227 $hb->add (new CFClient::UI::Button
922 text => "Quit anyway", 1228 text => "Quit anyway",
923 expand => 1, 1229 expand => 1,
924 on_activate => sub { exit }, 1230 on_activate => sub { exit },
… …
926 } 1232 }
927 1233
928 $QUIT_DIALOG->show; 1234 $QUIT_DIALOG->show;
929} 1235}
930 1236
931sub make_pickup_cfg_window { 1237sub autopickup_setup {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame 1238 my $table = new CFClient::UI::Table;
933 title => "Autopickup configuration",
934 x => "center",
935 y => "center",
936 force_w => $WIDTH * 6/10,
937 force_h => $HEIGHT * 9/10;
938
939
940 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
941 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
942 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
943 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
944 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
945
946 my $tbl = 0;
947 my $tblrow = 0;
948 1239
949 for ( 1240 for (
950 ["General", $gen_tbl], 1241 ["General", 0, 0,
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1243 ["Inhibit autopickup" => PICKUP_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1244 ["Stop before pickup" => PICKUP_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1245 ["Debug autopickup" => PICKUP_DEBUG],
1246 ],
955 ["Weapons", $ltbl], 1247 ["Weapons", 0, 6,
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1248 ["All weapons" => PICKUP_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1249 ["Missile weapons" => PICKUP_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW], 1250 ["Bows" => PICKUP_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW], 1251 ["Arrows" => PICKUP_ARROW],
1252 ],
960 ["Armour"], 1253 ["Armour", 0, 12,
961 ["Helmets" => CFClient::Pickup::PU_HELMET], 1254 ["Helmets" => PICKUP_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD], 1255 ["Shields" => PICKUP_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1256 ["Body Armour" => PICKUP_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS], 1257 ["Boots" => PICKUP_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1258 ["Gloves" => PICKUP_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1259 ["Cloaks" => PICKUP_CLOAK],
1260 ],
1261
967 ["Readables", $rtbl], 1262 ["Readables", 2, 2,
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1263 ["Spellbooks" => PICKUP_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1264 ["Skillscrolls" => PICKUP_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1265 ["Normal Books/Scrolls" => PICKUP_READABLES],
1266 ],
971 ["Misc"], 1267 ["Misc", 2, 7,
972 ["Food" => CFClient::Pickup::PU_FOOD], 1268 ["Food" => PICKUP_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK], 1269 ["Drinks" => PICKUP_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1270 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY], 1271 ["Keys" => PICKUP_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1272 ["Magical Items" => PICKUP_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION], 1273 ["Potions" => PICKUP_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1274 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1275 ["Ignore cursed" => PICKUP_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1276 ["Jewelery" => PICKUP_JEWELS],
1277 ],
1278 ["Weight/Value ratio", 2, 17]
981 ) 1279 )
982 { 1280 {
983 if (ref $_->[1]) { 1281 my ($title, $x, $y, @bits) = @$_;
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1282 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
987 } elsif (not defined $_->[1]) { 1283
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1284 for (@bits) {
989 } else { 1285 ++$y;
1286
990 my $mask = $_->[1]; 1287 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
994 on_changed => sub { 1291 on_changed => sub {
995 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1293
996 if ($value) { 1294 if ($value) {
997 $::CFG->{pickup} |= $mask; 1295 $::CFG->{pickup} |= $mask;
998 } else { 1296 } else {
999 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1297 $::CFG->{pickup} &= ~$mask;
1000 } 1298 }
1299
1001 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1300 $::CONN->send_command ("pickup $::CFG->{pickup}")
1002 if defined $::CONN; 1301 if defined $::CONN;
1302
1303 0
1003 }); 1304 });
1305
1306 ${$_->[2]} = $checkbox if $_->[2];
1004 } 1307 }
1005 } 1308 }
1006 1309
1007 $PICKUP_CFG 1310 $table->add (2, 18, new CFClient::UI::ValSlider
1008} 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99",
1313 to_value => sub { ">= " . 5 * $_[0] },
1314 on_changed => sub {
1315 my ($slider, $value) = @_;
1009 1316
1317 $::CFG->{pickup} &= ~0xF;
1318 $::CFG->{pickup} |= int $value
1319 if $value;
1320 1;
1321 });
1322
1323 $table->add (3, 18, new CFClient::UI::Button
1324 text => "set",
1325 on_activate => sub {
1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1327 if defined $::CONN;
1328 0
1329 });
1330
1331 $table
1332}
1333
1010sub make_inventory_window { 1334sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336
1337 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1339 $vb1->add ($INV = new CFClient::UI::Inventory);
1340
1341 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344
1345 $vb2->add ($INVR = new CFClient::UI::Inventory);
1346
1347 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349
1350 $hb
1351}
1352
1353sub toggle_player_page {
1354 my ($widget) = @_;
1355
1356 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1357 $PL_WINDOW->hide;
1358 } else {
1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
1361 }
1362}
1363
1364sub player_window {
1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1012 x => "center", 1366 x => "center",
1013 y => "center", 1367 y => "center",
1014 force_w => $WIDTH * 9/10, 1368 force_w => $WIDTH * 9/10,
1015 force_h => $HEIGHT * 9/10, 1369 force_h => $HEIGHT * 9/10,
1016 title => "Inventory", 1370 title => "Player",
1371 name => "playerbook",
1372 has_close_button => 1
1017 ; 1373 ;
1018 1374
1019 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1375 my $ntb =
1376 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1020 1382
1021 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add (
1022 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Stats" => $STATS_PAGE = stats_window,
1023 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1024 1386 );
1025 $hb->add (my $vb2 = new CFClient::UI::VBox); 1387 $ntb->add (
1026 1388 "Skills" => $STATS_PAGE = skill_window,
1027 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1389 "Shows all your Skills."
1028 1390 );
1029 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1391 $ntb->add (
1030
1031 # XXX: Call after $INVR = ... because set_opencont sets the items
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033
1034 $invwin
1035}
1036
1037sub make_spell_list {
1038 $SPELL_LIST = new CFClient::UI::SpellList 1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1039 force_w => $WIDTH * (9/10), 1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1040 force_h => $HEIGHT * (9/10); 1394 );
1041 $SPELL_LIST 1395 $ntb->add (
1042} 1396 Inventory => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 );
1043 1400
1044sub make_binding_window { 1401 $ntb->set_current_page ($INVENTORY_PAGE);
1402
1403 $plwin->add ($ntb);
1404 $plwin
1405}
1406
1407sub update_bindings {
1408 $BIND_UPD_CB->() if $BIND_UPD_CB;
1409}
1410
1411sub keyboard_setup {
1045 my $binding_list = new CFClient::UI::VBox; 1412 my $binding_list = new CFClient::UI::VBox;
1046 1413
1047 my $refresh; 1414 my $refresh;
1048 $refresh = sub { 1415 $refresh = $BIND_UPD_CB = sub {
1049 $binding_list->clear (); 1416 $binding_list->clear ();
1050 1417
1051 for my $mod (keys %{$::CFG->{bindings}}) { 1418 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1052 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1053 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1054 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1055 1422
1056 my $lbl = join "; ", @$cmds; 1423 my $lbl = join "; ", @$cmds;
1057 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1058 $binding_list->add (my $hb = new CFClient::UI::HBox); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1059 $hb->add (new CFClient::UI::Button 1426 $hb->add (new CFClient::UI::Button
1060 text => "delete", 1427 text => "delete",
1061 tooltip => "Deletes the binding", 1428 tooltip => "Deletes the binding",
1062 on_activate => sub { 1429 on_activate => sub {
1063 $binding_list->remove ($hb); 1430 $binding_list->remove ($hb);
1064 delete $::CFG->{bindings}->{$mod}->{$sym}; 1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0
1065 }); 1433 });
1066 1434
1067 $hb->add (new CFClient::UI::Button 1435 $hb->add (new CFClient::UI::Button
1068 text => "edit", 1436 text => "edit",
1069 tooltip => "Edits the binding", 1437 tooltip => "Edits the binding",
1070 on_activate => sub { 1438 on_activate => sub {
1071 $::BIND_EDITOR->set_binding ( 1439 $::BIND_EDITOR->set_binding (
1072 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1073 sub { 1441 sub {
1074 my ($nmod, $nsym, $ncmds) = @_; 1442 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym}; 1443 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1444 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1077 $refresh->(); 1445 $refresh->();
1446 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1078 $::BIND_WINDOW->show; 1447 $SETUP_DIALOG->show;
1079 }, 1448 },
1080 sub { 1449 sub {
1450 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1081 $::BIND_WINDOW->show; 1451 $SETUP_DIALOG->show;
1082 }); 1452 });
1083 $::BIND_EDITOR->show; 1453 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide; 1454 $SETUP_DIALOG->hide;
1455 0
1085 }); 1456 });
1086 1457
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 } 1460 }
1090 } 1461 }
1091 }; 1462 };
1092 1463
1093 $BIND_WINDOW = new CFClient::UI::FancyFrame 1464 my $vb = new CFClient::UI::VBox;
1094 title => "Bindings",
1095 x => "center",
1096 y => "center",
1097 def_w => int $WIDTH * 9/10,
1098 def_h => int $HEIGHT * 9/10,
1099 on_visibility_change => sub {
1100 my ($self, $visible) = @_;
1101 $refresh->() if $visible;
1102 };
1103
1104 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1465 $vb->add (my $hb = new CFClient::UI::HBox);
1466 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1467 $hb->add (new CFClient::UI::CheckBox
1468 expand => 1,
1469 state => $CFG->{shift_fire_stop},
1470 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1471 on_changed => sub {
1472 my ($cbox, $value) = @_;
1473 $CFG->{shift_fire_stop} = $value;
1474 0
1475 });
1476
1105 $vb->add ($binding_list); 1477 $vb->add ($binding_list);
1106 $vb->add (my $hb = new CFClient::UI::HBox); 1478 $vb->add (my $hb = new CFClient::UI::HBox);
1479
1107 $hb->add (new CFClient::UI::Button 1480 $hb->add (new CFClient::UI::Button
1108 text => "record new", 1481 text => "record new",
1109 expand => 1, 1482 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.", 1483 tooltip => "This button opens the binding editor with an empty binding.",
1111 on_activate => sub { 1484 on_activate => sub {
1112 $::BIND_EDITOR->set_binding (undef, undef, [], 1485 $::BIND_EDITOR->set_binding (undef, undef, [],
1113 sub { 1486 sub {
1114 my ($mod, $sym, $cmds) = @_; 1487 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1488 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1116 $refresh->(); 1489 $refresh->();
1117 $::BIND_WINDOW->show; 1490 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1491 $SETUP_DIALOG->show;
1118 }, 1492 },
1119 sub { 1493 sub {
1120 $::BIND_WINDOW->show; 1494 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1495 $SETUP_DIALOG->show;
1121 }); 1496 },
1122 $::BIND_WINDOW->hide; 1497 );
1498 $SETUP_DIALOG->hide;
1123 $::BIND_EDITOR->show; 1499 $::BIND_EDITOR->show;
1500 0
1124 }, 1501 },
1125 ); 1502 );
1503
1126 $hb->add (new CFClient::UI::Button 1504 $hb->add (new CFClient::UI::Button
1127 text => "close", 1505 text => "close",
1128 tooltip => "Closes the binding window", 1506 tooltip => "Closes the binding window",
1129 expand => 1, 1507 expand => 1,
1130 on_activate => sub { 1508 on_activate => sub {
1131 $::BIND_WINDOW->hide; 1509 $SETUP_DIALOG->hide;
1510 0
1132 } 1511 }
1133 ); 1512 );
1134 1513
1135 $refresh->(); 1514 $refresh->();
1136 $BIND_WINDOW
1137}
1138 1515
1516 $vb
1517}
1518
1139sub make_help_window { 1519sub help_window {
1140 my $win = new CFClient::UI::FancyFrame 1520 my $win = new CFClient::UI::FancyFrame
1141 x => 'center', 1521 x => 'center',
1142 y => 'center', 1522 y => 'center',
1523 z => 2,
1143 name => 'doc_browser', 1524 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8, 1525 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8, 1526 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation"; 1527 title => "Help Browser",
1528 has_close_button => 1;
1147 1529
1148 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
1149 1531
1150 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
1151 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1534 expand => 1, fontsize => 0.8, padding_x => 4);
1152 1535
1153 for ( 1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1537 $buttons->add (my $combo = new CFClient::UI::Combobox
1538 value => undef,
1539 options => [
1154 [intro => "Introduction"], 1540 [intro => "Introduction"],
1155 [manual => "Manual"], 1541 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"],
1543 [command_help => "Command Reference"],
1156 [command_help => "Commands"], 1544 [dmcommand_help => "DM Commands"],
1157 [skill_help => "Skills"], 1545 [COPYING => "License Terms"],
1158 ) { 1546 ],
1159 my ($pod, $label) = @$_; 1547 on_changed => sub {
1548 my ($self, $pod) = @_;
1160 1549
1161 $buttons->add (new CFClient::UI::Button 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1162 text => $label, 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1163 on_activate => sub {
1164 my $parser = new Pod::POM;
1165 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1166 1552
1167 $viewer->clear; 1553 $viewer->clear;
1554
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d#
1168 1559
1169 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1170 for @{ CFClient::pod_to_pango_list $pom }; 1561 for @$pom;
1171 1562
1172 $viewer->set_offset (0); 1563 $viewer->set_offset (0);
1564
1173 }, 1565 0
1566 },
1567 on_visibility_change => sub {
1568 my ($self, $visible) = @_;
1569 return unless $visible;
1570 return if $self->{value};
1571 $self->set_value ("intro");
1572 0
1573 },
1174 ); 1574 );
1175 }
1176
1177 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1178 1575
1179 $win 1576 $win
1180} 1577}
1181 1578
1182sub sdl_init { 1579sub sdl_init {
… …
1219 z => 100, 1616 z => 100,
1220 force_x => "max", 1617 force_x => "max",
1221 force_y => 0; 1618 force_y => 0;
1222 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1223 1620
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1225 1622
1226 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $STATUSBOX = new CFClient::UI::Statusbox;
1227 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1228 1625
1229 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
1230 bg => [0, 0, 0, 0.4], 1627 bg => [0, 0, 0, 0.4],
1231 force_x => 0, 1628 force_x => 0,
1232 force_y => "max", 1629 force_y => "max",
1233 child => $STATUSBOX, 1630 child => $STATUSBOX,
1234 )->show; 1631 )->show;
1235 1632
1236 CFClient::UI::FancyFrame->new ( 1633 CFClient::UI::FancyFrame->new (
1237 title => "Mini Map", 1634 title => "Map",
1238 name => "mapmap", 1635 name => "mapmap",
1239 x => 0, 1636 x => 0,
1240 y => $FONTSIZE + 8, 1637 y => $FONTSIZE + 8,
1241 border_bg => [1, 1, 1, 192/255], 1638 border_bg => [1, 1, 1, 192/255],
1242 bg => [1, 1, 1, 0], 1639 bg => [1, 1, 1, 0],
… …
1249 $MAPWIDGET->connect (activate_console => sub { 1646 $MAPWIDGET->connect (activate_console => sub {
1250 my ($mapwidget, $preset) = @_; 1647 my ($mapwidget, $preset) = @_;
1251 1648
1252 if ($CONSOLE) { 1649 if ($CONSOLE) {
1253 $CONSOLE->{input}->{auto_activated} = 1; 1650 $CONSOLE->{input}->{auto_activated} = 1;
1254 $CONSOLE->{input}->focus_in; 1651 $CONSOLE->{input}->grab_focus;
1255 1652
1256 if ($preset && $CONSOLE->{input}->get_text eq '') { 1653 if ($preset && $CONSOLE->{input}->get_text eq '') {
1257 $CONSOLE->{input}->set_text ($preset); 1654 $CONSOLE->{input}->set_text ($preset);
1258 } 1655 }
1259 } 1656 }
1260 }); 1657 });
1261 $MAPWIDGET->show; 1658 $MAPWIDGET->show;
1262 $MAPWIDGET->focus_in; 1659 $MAPWIDGET->grab_focus;
1263 1660
1264 $LOGVIEW = new CFClient::UI::TextView 1661 $LOGVIEW = new CFClient::UI::TextScroller
1265 expand => 1, 1662 expand => 1,
1266 font => $FONT_FIXED, 1663 font => $FONT_FIXED,
1267 fontsize => $::CFG->{log_fontsize}, 1664 fontsize => $::CFG->{log_fontsize},
1665 indent => -4,
1268 can_hover => 1, 1666 can_hover => 1,
1269 can_events => 1, 1667 can_events => 1,
1270 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1668 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1271 ; 1669 ;
1272 1670
1671 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1672 title => "Setup",
1673 name => "setup_dialog",
1674 x => 'center',
1675 y => 'center',
1676 z => 2,
1677 force_w => $::WIDTH * 0.6,
1678 force_h => $::HEIGHT * 0.6,
1679 has_close_button => 1,
1680 ;
1681
1682 $METASERVER = metaserver_dialog;
1683
1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1686
1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1688 "Configure the server to play on, your username, password and other server-related options.");
1689 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1690 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1691 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1692 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1693 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1694 "Configure the use of audio, sound effects and background music.");
1695 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1696 "Lets you define, edit and delete key bindings."
1697 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1698 . "with nothing set and the recording started. After doing the actions you "
1699 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1700 . "After pressing the combo the binding will be saved automatically and the "
1701 . "binding editor closes");
1702 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1703 "Some debuggin' options. Do not ask.");
1704
1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1274 1706
1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1707 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1276 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1708 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1709
1278 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1279 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1280 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1281 1712
1282 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 1713 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
1283 1714
1284 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1285 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1286 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1287 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1716 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1288 ."You can also hit the Tab-key to show/hide the Inventory.");
1289 1717
1290 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1291 text => "Save Config", 1719 text => "Save Config",
1292 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1720 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1293 on_activate => sub { 1721 on_activate => sub {
1294 $::CFG->{layout} = CFClient::UI::get_layout; 1722 $::CFG->{layout} = CFClient::UI::get_layout;
1295 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1296 status "Configuration Saved"; 1724 status "Configuration Saved";
1725 0
1297 }, 1726 },
1298 ); 1727 );
1299 1728
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1301 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1302
1303 $BUTTONBAR->add (new CFClient::UI::Flopper
1304 text => "Bindings",
1305 other => make_binding_window,
1306 tooltip =>
1307 "Lets you define, edit and delete bindings."
1308 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1309 ."with nothing set and the recording started. After doing the actions you "
1310 ."want to record press Insert and you will be asked to press a key-combo."
1311 ."After pressing the combo the binding will be saved automatically and the "
1312 ."binding editor closes");
1313
1314 $BUTTONBAR->add (new CFClient::UI::Flopper
1315 text => "Spells",
1316 other => make_spell_list,
1317 tooltip => "The spell list");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Pickup",
1321 other => make_pickup_cfg_window,
1322 tooltip => "The pickup dialog");
1323
1324 1731
1325 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1326 text => "Quit", 1733 text => "Quit",
1327 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
1328 on_activate => sub { 1735 on_activate => sub {
1329 if ($CONN) { 1736 if ($CONN) {
1330 open_quit_dialog; 1737 open_quit_dialog;
1331 } else { 1738 } else {
1332 exit; 1739 exit;
1333 } 1740 }
1741 0
1334 }, 1742 },
1335 ); 1743 );
1336 1744
1337 $BUTTONBAR->show; 1745 $BUTTONBAR->show;
1338 $SERVER_SETUP->show; 1746 $SETUP_DIALOG->show;
1339
1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1341 } 1747 }
1748
1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1342} 1750}
1343 1751
1344sub video_shutdown { 1752sub video_shutdown {
1753 CFClient::OpenGL::shutdown;
1754
1345 undef $SDL_ACTIVE; 1755 undef $SDL_ACTIVE;
1346} 1756}
1347 1757
1348my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1758my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1349my $bgmusic;#TODO#hack#d# 1759my $bgmusic;#TODO#hack#d#
… …
1478}; 1888};
1479 1889
1480 CFClient::SDL_GL_SwapBuffers; 1890 CFClient::SDL_GL_SwapBuffers;
1481} 1891}
1482 1892
1483my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1893my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1484 $NOW = time; 1894 $NOW = time;
1485 1895
1486 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1896 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1487 for CFClient::SDL_PollEvent; 1897 for CFClient::SDL_PollEvent;
1488 1898
… …
1530# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1940# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1531 }, 1941 },
1532 CFClient::SDL_KEYDOWN => sub { 1942 CFClient::SDL_KEYDOWN => sub {
1533 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1943 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1534 # alt-enter 1944 # alt-enter
1945 $FULLSCREEN_ENABLE->toggle;
1535 video_shutdown; 1946 video_shutdown;
1536 $CFG->{fullscreen} = !$CFG->{fullscreen};
1537 video_init; 1947 video_init;
1538 } else { 1948 } else {
1539 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1949 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1540 } 1950 }
1541 }, 1951 },
… …
1555############################################################################# 1965#############################################################################
1556 1966
1557$SIG{INT} = $SIG{TERM} = sub { exit }; 1967$SIG{INT} = $SIG{TERM} = sub { exit };
1558 1968
1559{ 1969{
1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1970 local $SIG{__DIE__} = sub {
1971 return unless defined $^S && !$^S;
1972 Carp::confess $_[1];#d#TODO: remove when stable
1973 CFClient::fatal $_[0];
1974 };
1561 1975
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1977 CFClient::UI::set_layout ($::CFG->{layout});
1564 1978
1565 my %DEF_CFG = ( 1979 my %DEF_CFG = (
1566 sdl_mode => 0, 1980 sdl_mode => 0,
1567 width => 640, 1981 width => 640,
1568 height => 480, 1982 height => 480,
1569 fullscreen => 0, 1983 fullscreen => 0,
1570 fast => 0, 1984 fast => 0,
1571 map_scale => 1, 1985 map_scale => 1,
1572 fow_enable => 1, 1986 fow_enable => 1,
1573 fow_intensity => 0.45, 1987 fow_intensity => 0.45,
1574 fow_smooth => 0, 1988 fow_smooth => 0,
1575 gui_fontsize => 1, 1989 gui_fontsize => 1,
1576 log_fontsize => 1, 1990 log_fontsize => 0.7,
1577 gauge_fontsize=> 1, 1991 gauge_fontsize => 1,
1578 gauge_size => 0.35, 1992 gauge_size => 0.35,
1579 stat_fontsize => 1, 1993 stat_fontsize => 0.7,
1580 mapsize => 100, 1994 mapsize => 100,
1581 host => "crossfire.schmorp.de",
1582 say_command => 'say', 1995 say_command => 'say',
1583 audio_enable => 1, 1996 audio_enable => 1,
1584 bgm_enable => 1, 1997 bgm_enable => 1,
1585 bgm_volume => 0.25, 1998 bgm_volume => 0.25,
1586 face_prefetch => 0, 1999 face_prefetch => 0,
1587 output_sync => 1, 2000 output_sync => 1,
1588 output_count => 1, 2001 output_count => 1,
2002 pickup => 0,
2003 default => "profile", # default profile
2004 );
1589 ); 2005
1590
1591 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1592 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1593 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1594 2011
1595 sdl_init; 2012 sdl_init;
1596 2013
1597 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1598 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1640 video_init; 2057 video_init;
1641 audio_init; 2058 audio_init;
1642} 2059}
1643 2060
1644Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1645 2064
1646END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1647 2066
1648=head1 NAME 2067=head1 NAME
1649 2068

Diff Legend

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