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.40 by root, Fri Jun 2 02:12:04 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; 130our $PICKUP_CFG;
113 131
114sub status { 132sub status {
115 $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]);
116} 134}
117 135
118sub debug { 136sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 137 $DEBUG_STATUS->set_text ($_[0]);
120} 138}
121 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
122sub start_game { 330sub start_game {
123 status "logging in..."; 331 status "logging in...";
124 332
125 $LOGIN_BUTTON->set_text ("Logout"); 333 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 334 $SETUP_DIALOG->hide;
127 335
128 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;
129 337
130 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
131 339
132 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
133 341
134 $CONN = eval { 342 $CONN = eval {
135 new CFClient::Protocol 343 new CFClient::Protocol
136 host => $host, 344 host => $host,
137 port => $port || 13327, 345 port => $port || 13327,
138 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
139 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
140 mapw => $mapsize, 348 mapw => $mapsize,
141 maph => $mapsize, 349 maph => $mapsize,
142 350
143 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW, 352 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 353 statusbox => $STATUSBOX,
146 map => $MAP, 354 map => $MAP,
147 mapmap => $MAPMAP, 355 mapmap => $MAPMAP,
356 query => \&server_query,
148 357
149 sound_play => sub { 358 sound_play => sub {
150 my ($x, $y, $soundnum, $type) = @_; 359 my ($x, $y, $soundnum, $type) = @_;
151 360
152 $SDL_MIXER 361 $SDL_MIXER
… …
169 } 378 }
170} 379}
171 380
172sub stop_game { 381sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
384 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
176 $LOGVIEW->hide; 386 $SPELL_PAGE->clear_spells;
177 387
178 return unless $CONN; 388 return unless $CONN;
179 389
180 status "connection closed"; 390 status "connection closed";
181 391
392 destroy_query_dialog $CONN;
182 $CONN->destroy; 393 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
184}
185 395
186sub client_setup { 396 undef $MAP;
187 my $dialog = new CFClient::UI::FancyFrame 397}
188 x => 1, 398
189 y => $HEIGHT * (1/8), 399sub graphics_setup {
190 name => "client_setup",
191 title => "Client Setup",
192 child => (my $vbox = new CFClient::UI::VBox); 400 my $vbox = new CFClient::UI::VBox;
193 401
194 $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]);
195 403
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 405 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
211 419
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 425 );
221 426
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fast}, 429 state => $CFG->{fast},
225 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
226 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fast} = $value;
229 }
230 ); 432 );
231 433
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 439 );
241 440
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 446 );
251 447
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 451 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 453 );
261 454
262 $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");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
265 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.",
266 on_changed => sub { 459 on_changed => sub {
267 my ($self, $value) = @_; 460 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
269 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
270 } 464 }
271 ); 465 );
272 466
273 $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");
274 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 470 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278 ); 472 );
279 473
280 $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");
281 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 );
286
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 ); 479 );
297 480
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 485 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
305 } 489 }
306 ); 490 );
307 491
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 496 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
315 } 500 }
316 ); 501 );
317 502
318 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
321 on_activate => sub { 506 on_activate => sub {
322 video_shutdown (); 507 video_shutdown ();
323 video_init (); 508 video_init ();
509 0
324 } 510 }
325 ); 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;
326 522
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
329 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
330 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.",
331 on_changed => sub { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
332 $CFG->{audio_enable} = $_[1];
333 }
334 ); 528 );
335# $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");
336# $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 {
337# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
338# }); 532# });
339 $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");
340 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
341 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
342 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
343 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.",
344 on_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
345 $CFG->{bgm_enable} = $_[1];
346 }
347 ); 539 );
348 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
349 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
350 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
351 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
352 $CFG->{bgm_volume} = $_[1];
353 CFClient::MixMusic::volume $_[1] * 128;
354 }
355 ); 544 );
356 545
357 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
358 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
359 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
360 on_activate => sub { 549 on_activate => sub {
361 audio_shutdown (); 550 audio_shutdown ();
362 audio_init (); 551 audio_init ();
552 0
363 } 553 }
364 ); 554 );
365 555
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 556 $vbox
367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368 text => $CFG->{say_command},
369 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. "
370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372 on_changed => sub {
373 my ($self, $value) = @_;
374 $CFG->{say_command} = $value;
375 }
376 );
377
378 $dialog
379}
380
381sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize});
384 }
385} 557}
386 558
387sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
388 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
389 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
441 &set_gauge_window_fontsize; 613 &set_gauge_window_fontsize;
442 614
443 $win 615 $win
444} 616}
445 617
618sub debug_setup {
619 my $table = new CFClient::UI::Table;
446 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
447sub make_stats_window { 646sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 647 my $vb = new CFClient::UI::VBox;
449 y => $HEIGHT * (2/8),
450 x => "max",
451 title => "Stats",
452 name => "stats_window";
453 648
454 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
455 $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,
456 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
457 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.");
458 $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,
459 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
… …
483 [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."],
484 678
485 [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."],
486 [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."],
487 [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."],
488 [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."],
489 [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."],
490 [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."],
491 ) { 685 ) {
492 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
493 687
… …
495 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);
496 $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
497 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);
498 } 692 }
499 693
500 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
501 695
502 my $row = 0; 696 my $row = 0;
503 my $col = 0; 697 my $col = 0;
504 698
505 my %resist_names = ( 699 my %resist_names = (
700 slow => ["Slow",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 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",
513 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",
514 pois => "<b>Poison</b> (resistance to getting poisoned)", 717 "<b>Poison</b> (resistance to getting poisoned)"],
718 para => ["Paralysation",
515 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",
516 deat => "<b>Death</b> (resistance against death spells)", 721 "<b>Death</b> (resistance against death spells)"],
517 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",
518 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",
519 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",
520 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",
521 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",
522 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",
523 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)"],
524 ); 736 );
525 for (qw/slow holyw conf fire depl magic 737 for (qw/slow holyw conf fire depl magic
526 drain acid pois para deat phys 738 drain acid pois para deat phys
527 blind fear tund elec cold ghit/) 739 blind fear tund elec cold ghit/)
528 { 740 {
… …
533 template => "-100%", 745 template => "-100%",
534 align => +1, 746 align => +1,
535 valign => 0, 747 valign => 0,
536 can_events => 1, 748 can_events => 1,
537 can_hover => 1, 749 can_hover => 1,
538 tooltip => $resist_names{$_}, 750 tooltip => $resist_names{$_}->[1],
539 ); 751 );
540 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
541 font => $FONT_FIXED, 753 font => $FONT_FIXED,
542 can_hover => 1, 754 can_hover => 1,
543 can_events => 1, 755 can_events => 1,
544 image => "ui/resist/resist_$_.png", 756 path => "ui/resist/resist_$_.png",
545 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],
546 ); 765 );
547 766
548 $row++; 767 $row++;
549 if ($row % 6 == 0) { 768 if ($row % 6 == 0) {
550 $col += 2; 769 $col += 3;
551 $row = 0; 770 $row = 0;
552 } 771 }
553 } 772 }
554 773
555 &set_stats_window_fontsize;
556 update_stats_window ({}); 774 update_stats_window ({});
557 775
558 $tgw 776 $vb
559} 777}
560 778
779sub skill_window {
780 my ($self) = @_;
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
782}
783
561sub formsep { 784sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563} 786}
564 787
565sub update_stats_window { 788sub update_stats_window {
566 my ($stats) = @_; 789 my ($stats) = @_;
567 790
… …
597 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
598 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
599 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
600 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
601 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
602 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
603 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
604 $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});
605 828
606 $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);
607 830
608 # TODO: replace by CS_STAT_RES_xxx constants
609 my %tbl = ( 831 my %tbl = (
610 phys => 100, 832 phys => CS_STAT_RES_PHYS,
611 magic => 101, 833 magic => CS_STAT_RES_MAG,
612 fire => 102, 834 fire => CS_STAT_RES_FIRE,
613 elec => 103, 835 elec => CS_STAT_RES_ELEC,
614 cold => 104, 836 cold => CS_STAT_RES_COLD,
615 conf => 105, 837 conf => CS_STAT_RES_CONF,
616 acid => 106, 838 acid => CS_STAT_RES_ACID,
617 drain => 107, 839 drain => CS_STAT_RES_DRAIN,
618 ghit => 108, 840 ghit => CS_STAT_RES_GHOSTHIT,
619 pois => 109, 841 pois => CS_STAT_RES_POISON,
620 slow => 110, 842 slow => CS_STAT_RES_SLOW,
621 para => 111, 843 para => CS_STAT_RES_PARA,
622 tund => 112, 844 tund => CS_STAT_TURN_UNDEAD,
623 fear => 113, 845 fear => CS_STAT_RES_FEAR,
624 depl => 113, 846 depl => CS_STAT_RES_DEPLETE,
625 deat => 115, 847 deat => CS_STAT_RES_DEATH,
626 holyw => 116, 848 holyw => CS_STAT_RES_HOLYWORD,
627 blind => 117, 849 blind => CS_STAT_RES_BLIND,
628 ); 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 }
629 888
630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
631 for keys %tbl; 890 for keys %tbl;
632} 891}
633 892
634my $METASERVER_ATIME; 893my $METASERVER_ATIME;
635 894
636sub update_metaserver { 895sub update_metaserver {
896 my ($metaserver_dialog) = @_;
897
898 $METASERVER = $metaserver_dialog
899 if defined $metaserver_dialog;
900
637 return if $METASERVER_ATIME > time; 901 return if $METASERVER_ATIME > time;
638 $METASERVER_ATIME = time + 60; 902 $METASERVER_ATIME = time + 60;
639 903
640 my $table = $METASERVER->{table}; 904 my $table = $METASERVER->{table};
641 $table->clear; 905 $table->clear;
… …
662 926
663 utf8::decode $buf if utf8::valid $buf; 927 utf8::decode $buf if utf8::valid $buf;
664 928
665 $table->clear; 929 $table->clear;
666 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 );
667 my @col = qw(Use #Users Host Uptime Version Description); 938 my @col = qw(#Users Host Uptime Version Description);
668 $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[$_])
669 for 0 .. $#col; 943 for 0 .. $#col;
670 944
671 my @align = qw(1 0 1 1 -1); 945 my @align = qw(1 0 1 1 -1);
672 946
673 my $y = 0; 947 my $y = 0;
674 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) {
… …
691 965
692 $m = [$users, $host, $uptime, $version, $desc]; 966 $m = [$users, $host, $uptime, $version, $desc];
693 967
694 $y++; 968 $y++;
695 969
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 970 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
697 (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 {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 975 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
699 $METASERVER->toggle_visibility; 976 $METASERVER->hide;
977 0
978 },
700 }), 979 ),
701 (new CFClient::UI::Empty expand => 1), 980 (new CFClient::UI::Empty expand => 1),
702 ]); 981 ]);
703 982
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 983 $table->add ($_, $y, new CFClient::UI::Label
705 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)
706 for 0 .. $#$m; 991 for 0 .. $#$m;
707 } 992 }
708 } 993 }
709 }); 994 });
710} 995}
711 996
712sub 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
713 my $dialog = new CFClient::UI::FancyFrame 1002 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List", 1003 title => "Server List",
1004 name => 'metaserver_dialog',
715 x => 'center', 1005 x => 'center',
716 y => 'center', 1006 y => 'center',
717 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,
718 on_visibility_change => sub { 1012 on_visibility_change => sub {
719 update_metaserver if $_[1]; 1013 update_metaserver ($_[0]) if $_[1];
1014 0
720 }, 1015 },
721 ; 1016 ;
722 1017
723 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
724
725 $dialog 1018 $dialog
726} 1019}
727 1020
728sub server_setup { 1021sub server_setup {
729 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
730 x => "center",
731 y => "center",
732 name => "server_setup",
733 title => "Server Setup",
734 child => (my $vbox = new CFClient::UI::VBox), 1022 my $vbox = new CFClient::UI::VBox;
735 ;
736 1023
737 $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]);
738 $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");
739 1026
740 { 1027 {
741 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1028 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
742 1029
743 $vbox->add ( 1030 $vbox->add (
744 $HOST_ENTRY = new CFClient::UI::Entry 1031 $HOST_ENTRY = new CFClient::UI::Entry
745 expand => 1, 1032 expand => 1,
746 text => $CFG->{host}, 1033 text => $CFG->{profile}{default}{host},
747 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",
748 on_changed => sub { 1035 on_changed => sub {
749 my ($self, $value) = @_; 1036 my ($self, $value) = @_;
750 $CFG->{host} = $value; 1037 $CFG->{profile}{default}{host} = $value;
1038 0
751 } 1039 }
752 ); 1040 );
753
754 $METASERVER = metaserver_dialog;
755 1041
756 $vbox->add (new CFClient::UI::Button 1042 $vbox->add (new CFClient::UI::Button
757 expand => 1, 1043 expand => 1,
758 text => "Server List", 1044 text => "Server List",
759 other => $METASERVER, 1045 other => $METASERVER,
760 tooltip => "Show a list of available crossfire servers", 1046 tooltip => "Show a list of available crossfire servers",
761 on_activate => sub { $METASERVER->toggle_visibility }, 1047 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1048 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
762 ); 1049 );
763 } 1050 }
764 1051
765 $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");
766 $table->add (1, 4, new CFClient::UI::Entry 1053 $table->add (1, 4, new CFClient::UI::Entry
767 text => $CFG->{user}, 1054 text => $CFG->{profile}{default}{user},
768 tooltip => "The name of your character on the server", 1055 tooltip => "The name of your character on the server",
769 on_changed => sub { 1056 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
770 my ($self, $value) = @_;
771 $CFG->{user} = $value;
772 }
773 ); 1057 );
774 1058
775 $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");
776 $table->add (1, 5, new CFClient::UI::Entry 1060 $table->add (1, 5, new CFClient::UI::Entry
777 text => $CFG->{password}, 1061 text => $CFG->{profile}{default}{password},
778 hidden => 1, 1062 hidden => 1,
779 tooltip => "The password for your character", 1063 tooltip => "The password for your character",
780 on_changed => sub { 1064 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
781 my ($self, $value) = @_;
782 $CFG->{password} = $value;
783 }
784 ); 1065 );
785 1066
786 $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");
787 $table->add (1, 7, new CFClient::UI::Slider 1068 $table->add (1, 7, new CFClient::UI::Slider
788 force_w => 100, 1069 force_w => 100,
789 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1070 range => [$CFG->{mapsize}, 10, 100, 0, 1],
790 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. "
791 . "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, "
792 . "but you also increase bandwidth requirements and latency. " 1073 . "but you also increase bandwidth requirements and latency. "
793 . "This option is only used once at log-in.", 1074 . "This option is only used once at log-in.",
794 on_changed => sub { 1075 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
795 my ($self, $value) = @_;
796
797 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
798 },
799 ); 1076 );
800 1077
801 $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");
802 $table->add (1, 8, new CFClient::UI::CheckBox 1079 $table->add (1, 8, new CFClient::UI::CheckBox
803 state => $CFG->{face_prefetch}, 1080 state => $CFG->{face_prefetch},
… …
806 . "This might increase or create lag, but increases the chances " 1083 . "This might increase or create lag, but increases the chances "
807 . "of faces being ready for display when you encounter them. " 1084 . "of faces being ready for display when you encounter them. "
808 . "It also uses up server bandwidth on every connect, " 1085 . "It also uses up server bandwidth on every connect, "
809 . "so only set it if you really need to prefetch images. " 1086 . "so only set it if you really need to prefetch images. "
810 . "This option can be set and unset any time.", 1087 . "This option can be set and unset any time.",
811 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1088 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
812 ); 1089 );
813 1090
814 $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");
815 $table->add (1, 9, new CFClient::UI::Entry 1092 $table->add (1, 9, new CFClient::UI::Entry
816 text => $CFG->{output_count}, 1093 text => $CFG->{output_count},
817 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.",
818 on_changed => sub { $CFG->{output_count} = $_[1] }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
819 ); 1096 );
820 1097
821 $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");
822 $table->add (1, 10, new CFClient::UI::Entry 1099 $table->add (1, 10, new CFClient::UI::Entry
823 text => $CFG->{output_sync}, 1100 text => $CFG->{output_sync},
824 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.",
825 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
826 ); 1103 );
827 1104
828 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1105 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
829 expand => 1, 1106 expand => 1,
830 align => 0, 1107 align => 0,
831 text => "Login", 1108 text => "Login",
832 on_activate => sub { 1109 on_activate => sub {
833 $CONN ? stop_game 1110 $CONN ? stop_game
834 : start_game; 1111 : start_game;
1112 0
835 }, 1113 },
836 ); 1114 );
837 1115
838 $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
839} 1139}
840 1140
841sub message_window { 1141sub message_window {
842 my $window = new CFClient::UI::FancyFrame 1142 my $window = new CFClient::UI::FancyFrame
843 name => "message_window", 1143 name => "message_window",
844 title => "Messages", 1144 title => "Messages",
845 border_bg => [1, 1, 1, 1], 1145 border_bg => [1, 1, 1, 1],
846 bg => [0, 0, 0, 0.75],
847 x => "max", 1146 x => "max",
848 y => 0, 1147 y => 0,
849 force_w => $::WIDTH / 3, 1148 force_w => $::WIDTH * 0.4,
850 force_h => $::HEIGHT / 5, 1149 force_h => $::HEIGHT * 0.5,
851 child => (my $vbox = new CFClient::UI::VBox); 1150 child => (my $vbox = new CFClient::UI::VBox),
1151 has_close_button => 1;
852 1152
853 $vbox->add ($LOGVIEW); 1153 $vbox->add ($LOGVIEW);
854 1154
855 $vbox->add (my $input = new CFClient::UI::Entry 1155 $vbox->add (my $input = new CFClient::UI::Entry
856 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> "
… …
864 1164
865 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1165 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
866 $input->{refocus_map} = 1; 1166 $input->{refocus_map} = 1;
867 } 1167 }
868 delete $input->{auto_activated}; 1168 delete $input->{auto_activated};
1169
1170 0
869 }, 1171 },
870 on_activate => sub { 1172 on_activate => sub {
871 my ($input, $text) = @_; 1173 my ($input, $text) = @_;
872 $input->set_text (''); 1174 $input->set_text ('');
873 1175
874 if ($text =~ /^\/bind\s+(.*)$/) {
875 CFClient::Binder::open_binding_dialog (sub {
876 my ($mod, $sym) = @_;
877 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
878 });
879 } elsif ($text =~ /^\/(.*)/) { 1176 if ($text =~ /^\/(.*)/) {
880 $::CONN->user_send ($1); 1177 $::CONN->user_send ($1);
881 } else { 1178 } else {
882 my $say_cmd = $::CFG->{say_command} || 'say'; 1179 my $say_cmd = $::CFG->{say_command} || 'say';
883 $::CONN->user_send ("$say_cmd $text"); 1180 $::CONN->user_send ("$say_cmd $text");
884 } 1181 }
885 if ($input->{refocus_map}) { 1182 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1183 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1184 $MAPWIDGET->focus_in
888 } 1185 }
1186
1187 0
889 }, 1188 },
890 on_escape => sub { 1189 on_escape => sub {
891 $MAPWIDGET->focus_in 1190 $MAPWIDGET->grab_focus;
1191
1192 0
892 }, 1193 },
893 ); 1194 );
894 1195
895 $CONSOLE = { 1196 $CONSOLE = {
896 window => $window, 1197 window => $window,
… …
903sub open_quit_dialog { 1204sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1205 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1206 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1207 x => "center",
907 y => "center", 1208 y => "center",
1209 z => 50,
908 title => "Really Quit?", 1210 title => "Really Quit?",
909 ; 1211 ;
910 1212
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1213 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1214
… …
917 ); 1219 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1220 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1221 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1222 text => "Ok",
921 expand => 1, 1223 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1224 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1225 );
924 $hb->add (new CFClient::UI::Button 1226 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1227 text => "Quit anyway",
926 expand => 1, 1228 expand => 1,
927 on_activate => sub { exit }, 1229 on_activate => sub { exit },
… …
929 } 1231 }
930 1232
931 $QUIT_DIALOG->show; 1233 $QUIT_DIALOG->show;
932} 1234}
933 1235
1236sub autopickup_setup {
1237 my $table = new CFClient::UI::Table;
1238
1239 for (
1240 ["General", 0, 0,
1241 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1242 ["Inhibit autopickup" => PICKUP_INHIBIT],
1243 ["Stop before pickup" => PICKUP_STOP],
1244 ["Debug autopickup" => PICKUP_DEBUG],
1245 ],
1246 ["Weapons", 0, 6,
1247 ["All weapons" => PICKUP_ALLWEAPON],
1248 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1249 ["Bows" => PICKUP_BOW],
1250 ["Arrows" => PICKUP_ARROW],
1251 ],
1252 ["Armour", 0, 12,
1253 ["Helmets" => PICKUP_HELMET],
1254 ["Shields" => PICKUP_SHIELD],
1255 ["Body Armour" => PICKUP_ARMOUR],
1256 ["Boots" => PICKUP_BOOTS],
1257 ["Gloves" => PICKUP_GLOVES],
1258 ["Cloaks" => PICKUP_CLOAK],
1259 ],
1260
1261 ["Readables", 2, 2,
1262 ["Spellbooks" => PICKUP_SPELLBOOK],
1263 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1264 ["Normal Books/Scrolls" => PICKUP_READABLES],
1265 ],
1266 ["Misc", 2, 7,
1267 ["Food" => PICKUP_FOOD],
1268 ["Drinks" => PICKUP_DRINK],
1269 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1270 ["Keys" => PICKUP_KEY],
1271 ["Magical Items" => PICKUP_MAGICAL],
1272 ["Potions" => PICKUP_POTION],
1273 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1274 ["Ignore cursed" => PICKUP_NOT_CURSED],
1275 ["Jewelery" => PICKUP_JEWELS],
1276 ],
1277 ["Weight/Value ratio", 2, 17]
1278 )
1279 {
1280 my ($title, $x, $y, @bits) = @$_;
1281 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1282
1283 for (@bits) {
1284 ++$y;
1285
1286 my $mask = $_->[1];
1287 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1288 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1289 state => $::CFG->{pickup} & $mask,
1290 on_changed => sub {
1291 my ($box, $value) = @_;
1292
1293 if ($value) {
1294 $::CFG->{pickup} |= $mask;
1295 } else {
1296 $::CFG->{pickup} &= ~$mask;
1297 }
1298
1299 $::CONN->send_command ("pickup $::CFG->{pickup}")
1300 if defined $::CONN;
1301
1302 0
1303 });
1304
1305 ${$_->[2]} = $checkbox if $_->[2];
1306 }
1307 }
1308
1309 $table->add (2, 18, new CFClient::UI::ValSlider
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) = @_;
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
934sub 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 {
935 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1364 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
936 x => "center", 1365 x => "center",
937 y => "center", 1366 y => "center",
938 force_w => $WIDTH * 9/10, 1367 force_w => $WIDTH * 9/10,
939 force_h => $HEIGHT * 9/10, 1368 force_h => $HEIGHT * 9/10,
940 title => "Inventory", 1369 title => "Player",
1370 name => "playerbook",
1371 has_close_button => 1
941 ; 1372 ;
942 1373
943 $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 ;
944 1381
945 $hb->add (my $vb1 = new CFClient::UI::VBox); 1382 $ntb->add (
946 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1383 "Stats" => $STATS_PAGE = stats_window,
947 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1384 "Shows statistics, where all your Stats and Resistances are shown."
948 1385 );
949 $hb->add (my $vb2 = new CFClient::UI::VBox); 1386 $ntb->add (
950 1387 "Skills" => $STATS_PAGE = skill_window,
951 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1388 "Shows all your Skills."
952 1389 );
953 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1390 $ntb->add (
954
955 # XXX: Call after $INVR = ... because set_opencont sets the items
956 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
957
958 $invwin
959}
960
961sub make_spell_list {
962 $SPELL_LIST = new CFClient::UI::SpellList 1391 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
963 force_w => $WIDTH * (9/10), 1392 "Displays all spells you have and lets you edit keyboard shortcuts for them."
964 force_h => $HEIGHT * (9/10); 1393 );
965 $SPELL_LIST 1394 $ntb->add (
966} 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 );
967 1399
968sub 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 {
969 my $binding_list = new CFClient::UI::VBox; 1411 my $binding_list = new CFClient::UI::VBox;
970 1412
971 my $refresh; 1413 my $refresh;
972 $refresh = sub { 1414 $refresh = $BIND_UPD_CB = sub {
973 $binding_list->clear (); 1415 $binding_list->clear ();
974 1416
975 for my $mod (keys %{$::CFG->{bindings}}) { 1417 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
976 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1418 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
977 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1419 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
978 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1420 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
979 1421
980 my $lbl = join "; ", @$cmds; 1422 my $lbl = join "; ", @$cmds;
981 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1423 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
982 $binding_list->add (my $hb = new CFClient::UI::HBox); 1424 $binding_list->add (my $hb = new CFClient::UI::HBox);
983 $hb->add (new CFClient::UI::Button 1425 $hb->add (new CFClient::UI::Button
984 text => "delete", 1426 text => "delete",
985 tooltip => "Deletes the binding", 1427 tooltip => "Deletes the binding",
986 on_activate => sub { 1428 on_activate => sub {
987 $binding_list->remove ($hb); 1429 $binding_list->remove ($hb);
988 delete $::CFG->{bindings}->{$mod}->{$sym}; 1430 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1431 0
989 }); 1432 });
990 1433
991 $hb->add (new CFClient::UI::Button 1434 $hb->add (new CFClient::UI::Button
992 text => "edit", 1435 text => "edit",
993 tooltip => "Edits the binding", 1436 tooltip => "Edits the binding",
994 on_activate => sub { 1437 on_activate => sub {
995 $::BIND_EDITOR->set_binding ( 1438 $::BIND_EDITOR->set_binding (
996 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1439 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
997 sub { 1440 sub {
998 my ($nmod, $nsym, $ncmds) = @_; 1441 my ($nmod, $nsym, $ncmds) = @_;
999 delete $::CFG->{bindings}->{$mod}->{$sym}; 1442 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1000 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1443 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1001 $refresh->(); 1444 $refresh->();
1445 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1002 $::BIND_WINDOW->show; 1446 $SETUP_DIALOG->show;
1003 }, 1447 },
1004 sub { 1448 sub {
1449 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1005 $::BIND_WINDOW->show; 1450 $SETUP_DIALOG->show;
1006 }); 1451 });
1007 $::BIND_EDITOR->show; 1452 $::BIND_EDITOR->show;
1008 $::BIND_WINDOW->hide; 1453 $SETUP_DIALOG->hide;
1454 0
1009 }); 1455 });
1010 1456
1011 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1457 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1012 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1458 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1013 } 1459 }
1014 } 1460 }
1015 }; 1461 };
1016 1462
1017 $BIND_WINDOW = new CFClient::UI::FancyFrame 1463 my $vb = new CFClient::UI::VBox;
1018 title => "Bindings",
1019 x => "center",
1020 y => "center",
1021 def_w => int $WIDTH * 9/10,
1022 def_h => int $HEIGHT * 9/10,
1023 on_visibility_change => sub {
1024 my ($self, $visible) = @_;
1025 $refresh->() if $visible;
1026 };
1027
1028 $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
1029 $vb->add ($binding_list); 1476 $vb->add ($binding_list);
1030 $vb->add (my $hb = new CFClient::UI::HBox); 1477 $vb->add (my $hb = new CFClient::UI::HBox);
1478
1031 $hb->add (new CFClient::UI::Button 1479 $hb->add (new CFClient::UI::Button
1032 text => "record new", 1480 text => "record new",
1033 expand => 1, 1481 expand => 1,
1034 tooltip => "This button opens the binding editor with an empty binding.", 1482 tooltip => "This button opens the binding editor with an empty binding.",
1035 on_activate => sub { 1483 on_activate => sub {
1036 $::BIND_EDITOR->set_binding (undef, undef, [], 1484 $::BIND_EDITOR->set_binding (undef, undef, [],
1037 sub { 1485 sub {
1038 my ($mod, $sym, $cmds) = @_; 1486 my ($mod, $sym, $cmds) = @_;
1039 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1487 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1040 $refresh->(); 1488 $refresh->();
1041 $::BIND_WINDOW->show; 1489 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1490 $SETUP_DIALOG->show;
1042 }, 1491 },
1043 sub { 1492 sub {
1044 $::BIND_WINDOW->show; 1493 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1494 $SETUP_DIALOG->show;
1045 }); 1495 },
1046 $::BIND_WINDOW->hide; 1496 );
1497 $SETUP_DIALOG->hide;
1047 $::BIND_EDITOR->show; 1498 $::BIND_EDITOR->show;
1499 0
1048 }, 1500 },
1049 ); 1501 );
1502
1050 $hb->add (new CFClient::UI::Button 1503 $hb->add (new CFClient::UI::Button
1051 text => "close", 1504 text => "close",
1052 tooltip => "Closes the binding window", 1505 tooltip => "Closes the binding window",
1053 expand => 1, 1506 expand => 1,
1054 on_activate => sub { 1507 on_activate => sub {
1055 $::BIND_WINDOW->hide; 1508 $SETUP_DIALOG->hide;
1509 0
1056 } 1510 }
1057 ); 1511 );
1058 1512
1059 $refresh->(); 1513 $refresh->();
1060 $BIND_WINDOW
1061}
1062 1514
1515 $vb
1516}
1517
1063sub make_help_window { 1518sub help_window {
1064 my $win = new CFClient::UI::FancyFrame 1519 my $win = new CFClient::UI::FancyFrame
1520 x => 'center',
1521 y => 'center',
1522 z => 2,
1523 name => 'doc_browser',
1065 def_w => int $WIDTH * 7/8, 1524 force_w => int $WIDTH * 7/8,
1066 def_h => int $HEIGHT * 7/8, 1525 force_h => int $HEIGHT * 7/8,
1067 title => "Documentation"; 1526 title => "Help Browser",
1527 has_close_button => 1;
1068 1528
1069 $win->add (my $vbox = new CFClient::UI::VBox); 1529 $win->add (my $vbox = new CFClient::UI::VBox);
1070 1530
1071 $vbox->add (my $buttons = new CFClient::UI::HBox); 1531 $vbox->add (my $buttons = new CFClient::UI::HBox);
1072 $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);
1073 1534
1074 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 => [
1075 [intro => "Introduction"], 1539 [intro => "Introduction"],
1076 [manual => "Manual"], 1540 [manual => "Main Manual"],
1541 [skill_help => "Skill Reference"],
1542 [command_help => "Command Reference"],
1077 [command_help => "Commands"], 1543 [dmcommand_help => "DM Commands"],
1078 [skill_help => "Skills"], 1544 [COPYING => "License Terms"],
1079 ) { 1545 ],
1080 my ($pod, $label) = @$_; 1546 on_changed => sub {
1547 my ($self, $pod) = @_;
1081 1548
1082 $buttons->add (new CFClient::UI::Button 1549 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1083 text => $label, 1550 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1084 on_activate => sub {
1085 my $parser = new Pod::POM;
1086 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1087 1551
1088 $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#
1089 1558
1090 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1559 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1091 for @{ CFClient::pod_to_pango_list $pom }; 1560 for @$pom;
1092 1561
1093 $viewer->set_offset (0); 1562 $viewer->set_offset (0);
1563
1094 }, 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 },
1095 ); 1573 );
1096 }
1097
1098 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1099 1574
1100 $win 1575 $win
1101} 1576}
1102 1577
1103sub sdl_init { 1578sub sdl_init {
… …
1140 z => 100, 1615 z => 100,
1141 force_x => "max", 1616 force_x => "max",
1142 force_y => 0; 1617 force_y => 0;
1143 $DEBUG_STATUS->show; 1618 $DEBUG_STATUS->show;
1144 1619
1145 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1620 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1146 1621
1147 $STATUSBOX = new CFClient::UI::Statusbox; 1622 $STATUSBOX = new CFClient::UI::Statusbox;
1148 $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]);
1149 1624
1150 (new CFClient::UI::Frame 1625 (new CFClient::UI::Frame
1151 bg => [0, 0, 0, 0.4], 1626 bg => [0, 0, 0, 0.4],
1152 force_x => 0, 1627 force_x => 0,
1153 force_y => "max", 1628 force_y => "max",
1154 child => $STATUSBOX, 1629 child => $STATUSBOX,
1155 )->show; 1630 )->show;
1156 1631
1157 CFClient::UI::FancyFrame->new ( 1632 CFClient::UI::FancyFrame->new (
1633 title => "Map",
1634 name => "mapmap",
1158 x => 0, 1635 x => 0,
1159 y => $FONTSIZE + 8, 1636 y => $FONTSIZE + 8,
1160 border_bg => [1, 1, 1, 192/255], 1637 border_bg => [1, 1, 1, 192/255],
1161 bg => [1, 1, 1, 0], 1638 bg => [1, 1, 1, 0],
1162 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1639 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1168 $MAPWIDGET->connect (activate_console => sub { 1645 $MAPWIDGET->connect (activate_console => sub {
1169 my ($mapwidget, $preset) = @_; 1646 my ($mapwidget, $preset) = @_;
1170 1647
1171 if ($CONSOLE) { 1648 if ($CONSOLE) {
1172 $CONSOLE->{input}->{auto_activated} = 1; 1649 $CONSOLE->{input}->{auto_activated} = 1;
1173 $CONSOLE->{input}->focus_in; 1650 $CONSOLE->{input}->grab_focus;
1174 1651
1175 if ($preset && $CONSOLE->{input}->get_text eq '') { 1652 if ($preset && $CONSOLE->{input}->get_text eq '') {
1176 $CONSOLE->{input}->set_text ($preset); 1653 $CONSOLE->{input}->set_text ($preset);
1177 } 1654 }
1178 } 1655 }
1179 }); 1656 });
1180 $MAPWIDGET->show; 1657 $MAPWIDGET->show;
1181 $MAPWIDGET->focus_in; 1658 $MAPWIDGET->grab_focus;
1182 1659
1183 $LOGVIEW = new CFClient::UI::TextView 1660 $LOGVIEW = new CFClient::UI::TextScroller
1184 expand => 1, 1661 expand => 1,
1185 font => $FONT_FIXED, 1662 font => $FONT_FIXED,
1186 fontsize => $::CFG->{log_fontsize}, 1663 fontsize => $::CFG->{log_fontsize},
1664 indent => -4,
1187 can_hover => 1, 1665 can_hover => 1,
1188 can_events => 1, 1666 can_events => 1,
1189 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.",
1190 ; 1668 ;
1191 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
1192 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1704 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1193 1705
1194 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1706 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1195 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.");
1196 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1708
1197 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1198 $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,
1199 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.");
1200 1711
1201 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
1202 1713
1203 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1204 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1205 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1714 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1206 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.");
1207 ."You can also hit the Tab-key to show/hide the Inventory.");
1208 1716
1209 $BUTTONBAR->add (new CFClient::UI::Button 1717 $BUTTONBAR->add (new CFClient::UI::Button
1210 text => "Save Config", 1718 text => "Save Config",
1211 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.",
1212 on_activate => sub { 1720 on_activate => sub {
1213 $::CFG->{layout} = CFClient::UI::get_layout; 1721 $::CFG->{layout} = CFClient::UI::get_layout;
1214 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1722 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1215 status "Configuration Saved"; 1723 status "Configuration Saved";
1724 0
1216 }, 1725 },
1217 ); 1726 );
1218 1727
1219 $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,
1220 tooltip => "View Documentation"); 1729 tooltip => "View Documentation");
1221
1222 $BUTTONBAR->add (new CFClient::UI::Flopper
1223 text => "Bindings",
1224 other => make_binding_window,
1225 tooltip =>
1226 "Lets you define, edit and delete bindings."
1227 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1228 ."with nothing set and the recording started. After doing the actions you "
1229 ."want to record press Insert and you will be asked to press a key-combo."
1230 ."After pressing the combo the binding will be saved automatically and the "
1231 ."binding editor closes");
1232
1233 $BUTTONBAR->add (new CFClient::UI::Flopper
1234 text => "Spells",
1235 other => make_spell_list,
1236 tooltip => "The spell list");
1237 1730
1238 $BUTTONBAR->add (new CFClient::UI::Button 1731 $BUTTONBAR->add (new CFClient::UI::Button
1239 text => "Quit", 1732 text => "Quit",
1240 tooltip => "Terminates the program", 1733 tooltip => "Terminates the program",
1241 on_activate => sub { 1734 on_activate => sub {
1242 if ($CONN) { 1735 if ($CONN) {
1243 open_quit_dialog; 1736 open_quit_dialog;
1244 } else { 1737 } else {
1245 exit; 1738 exit;
1246 } 1739 }
1740 0
1247 }, 1741 },
1248 ); 1742 );
1249 1743
1250 $BUTTONBAR->show; 1744 $BUTTONBAR->show;
1251 $SERVER_SETUP->show; 1745 $SETUP_DIALOG->show;
1252
1253 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1254 } 1746 }
1747
1748 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1255} 1749}
1256 1750
1257sub video_shutdown { 1751sub video_shutdown {
1752 CFClient::OpenGL::shutdown;
1753
1258 undef $SDL_ACTIVE; 1754 undef $SDL_ACTIVE;
1259} 1755}
1260 1756
1261my @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#
1262my $bgmusic;#TODO#hack#d# 1758my $bgmusic;#TODO#hack#d#
… …
1391}; 1887};
1392 1888
1393 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1394} 1890}
1395 1891
1396my $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 {
1397 $NOW = time; 1893 $NOW = time;
1398 1894
1399 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1895 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1400 for CFClient::SDL_PollEvent; 1896 for CFClient::SDL_PollEvent;
1401 1897
… …
1468############################################################################# 1964#############################################################################
1469 1965
1470$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1471 1967
1472{ 1968{
1473 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 };
1474 1974
1475 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1476 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
1477 1977
1478 my %DEF_CFG = ( 1978 my %DEF_CFG = (
1479 sdl_mode => 0, 1979 sdl_mode => 0,
1480 width => 640, 1980 width => 640,
1481 height => 480, 1981 height => 480,
1482 fullscreen => 0, 1982 fullscreen => 0,
1483 fast => 0, 1983 fast => 0,
1484 map_scale => 1, 1984 map_scale => 1,
1485 fow_enable => 1, 1985 fow_enable => 1,
1486 fow_intensity => 0.45, 1986 fow_intensity => 0.45,
1487 fow_smooth => 0, 1987 fow_smooth => 0,
1488 gui_fontsize => 1, 1988 gui_fontsize => 1,
1489 log_fontsize => 1, 1989 log_fontsize => 0.7,
1490 gauge_fontsize=> 1, 1990 gauge_fontsize => 1,
1491 gauge_size => 0.35, 1991 gauge_size => 0.35,
1492 stat_fontsize => 1, 1992 stat_fontsize => 0.7,
1493 mapsize => 100, 1993 mapsize => 100,
1494 host => "crossfire.schmorp.de",
1495 say_command => 'say', 1994 say_command => 'say',
1496 audio_enable => 1, 1995 audio_enable => 1,
1497 bgm_enable => 1, 1996 bgm_enable => 1,
1498 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1499 face_prefetch => 0, 1998 face_prefetch => 0,
1500 output_sync => 1, 1999 output_sync => 1,
1501 output_count => 1, 2000 output_count => 1,
2001 pickup => 0,
2002 default => "profile", # default profile
2003 );
1502 ); 2004
1503
1504 while (my ($k, $v) = each %DEF_CFG) { 2005 while (my ($k, $v) = each %DEF_CFG) {
1505 $CFG->{$k} = $v unless exists $CFG->{$k}; 2006 $CFG->{$k} = $v unless exists $CFG->{$k};
1506 } 2007 }
2008
2009 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1507 2010
1508 sdl_init; 2011 sdl_init;
1509 2012
1510 @SDL_MODES = reverse 2013 @SDL_MODES = reverse
1511 grep $_->[0] >= 640 && $_->[1] >= 480, 2014 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1553 video_init; 2056 video_init;
1554 audio_init; 2057 audio_init;
1555} 2058}
1556 2059
1557Event::loop; 2060Event::loop;
2061#CFClient::SDL_Quit;
2062#CFClient::_exit 0;
1558 2063
1559END { CFClient::SDL_Quit } 2064END { CFClient::SDL_Quit }
1560 2065
1561=head1 NAME 2066=head1 NAME
1562 2067

Diff Legend

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