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

Diff Legend

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