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.38 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.94 by root, Sun Jul 16 20:04:08 2006 UTC

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

Diff Legend

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