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.18 by root, Sat May 27 20:46:54 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;
90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
93our $SERVER_INFO;
86 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;
87our $FLOORBOX; 109our $FLOORBOX;
88our $GAUGES; 110our $GAUGES;
89our $STATWIDS; 111our $STATWIDS;
90 112
91our $SDL_ACTIVE; 113our $SDL_ACTIVE;
99our $STATUSBOX; 121our $STATUSBOX;
100our $DEBUG_STATUS; 122our $DEBUG_STATUS;
101 123
102our $INV; 124our $INV;
103our $INVR; 125our $INVR;
104our $INVR_LBL; 126our $INV_RIGHT_HB;
127
128our $BIND_EDITOR;
129our $BIND_UPD_CB;
130
131our $PICKUP_CFG;
105 132
106sub status { 133sub status {
107 $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]);
108} 135}
109 136
110sub debug { 137sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 138 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 139}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
114} 329}
115 330
116sub start_game { 331sub start_game {
117 status "logging in..."; 332 status "logging in...";
118 333
334 $LOGIN_BUTTON->set_text ("Logout");
335 $SETUP_DIALOG->hide;
336
119 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;
120 338
121 my ($host, $port) = split /:/, $CFG->{host}; 339 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
122 340
123 $MAP = new CFClient::Map $mapsize, $mapsize; 341 $MAP = new CFClient::Map $mapsize, $mapsize;
124 342
125 $CONN = eval { 343 $CONN = eval {
126 new CFClient::Protocol 344 new CFClient::Protocol
127 host => $host, 345 host => $host,
128 port => $port || 13327, 346 port => $port || 13327,
129 user => $CFG->{user}, 347 user => $CFG->{profile}{default}{user},
130 pass => $CFG->{password}, 348 pass => $CFG->{profile}{default}{password},
131 mapw => $mapsize, 349 mapw => $mapsize,
132 maph => $mapsize, 350 maph => $mapsize,
133 351
134 map_widget => $MAPWIDGET, 352 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 353 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 354 statusbox => $STATUSBOX,
137 map => $MAP, 355 map => $MAP,
138 mapmap => $MAPMAP, 356 mapmap => $MAPMAP,
357 query => \&server_query,
139 358
140 sound_play => sub { 359 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 360 my ($x, $y, $soundnum, $type) = @_;
142 361
143 $SDL_MIXER 362 $SDL_MIXER
151 }; 370 };
152 371
153 if ($CONN) { 372 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 373 CFClient::lowdelay fileno $CONN->{fh};
155 374
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 375 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 376 } else {
163 status "unable to connect"; 377 status "unable to connect";
164 stop_game(); 378 stop_game();
165 } 379 }
166} 380}
167 381
168sub stop_game { 382sub stop_game {
383 $LOGIN_BUTTON->set_text ("Login");
384 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
385 $SETUP_DIALOG->show;
386 $PL_WINDOW->hide;
387 $SPELL_PAGE->clear_spells;
388
169 return unless $CONN; 389 return unless $CONN;
170 390
171 status "connection closed"; 391 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 392
393 destroy_query_dialog $CONN;
173 $CONN->destroy; 394 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 395 $CONN = 0; # false, does not autovivify
175 396
176 $BUTTONBAR->{children}[1]->emit ("activate") 397 undef $MAP;
177 unless $BUTTONBAR->{children}[1]->{state};
178} 398}
179 399
180sub client_setup { 400sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 name => "client_setup",
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 401 my $vbox = new CFClient::UI::VBox;
402
185 $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]);
186 404
187 $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");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 406 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 407
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 408 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 409 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 410
193 $mode_slider->connect (changed => sub { 411 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 412 my ($self, $value) = @_;
195 413
199 $mode_slider->emit (changed => $mode_slider->{range}[0]); 417 $mode_slider->emit (changed => $mode_slider->{range}[0]);
200 418
201 my $row = 1; 419 my $row = 1;
202 420
203 $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");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 422 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 423 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 424 tooltip => "Bring the client into fullscreen mode.",
207 on_changed => sub { 425 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value;
210 }
211 ); 426 );
212 427
213 $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");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 430 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 431 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 on_changed => sub { 432 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fast} = $value;
220 }
221 ); 433 );
222 434
223 $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");
224 $table->add (1, $row++, new CFClient::UI::Slider 436 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 437 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 438 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 on_changed => sub { 439 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value;
230 }
231 ); 440 );
232 441
233 $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");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 443 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 444 state => $CFG->{fow_enable},
236 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.",
237 on_changed => sub { 446 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value;
240 }
241 ); 447 );
242 448
243 $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");
244 $table->add (1, $row++, new CFClient::UI::Slider 450 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 451 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 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.",
247 on_changed => sub { 453 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value;
250 }
251 ); 454 );
252 455
253 $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");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 457 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 458 state => $CFG->{fow_smooth},
256 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.",
257 on_changed => sub { 460 on_changed => sub {
258 my ($self, $value) = @_; 461 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 462 $CFG->{fow_smooth} = $value;
260 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
261 } 465 }
262 ); 466 );
263 467
264 $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");
265 $table->add (1, $row++, new CFClient::UI::Slider 469 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 470 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 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.",
268 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 472 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
269 ); 473 );
270 474
271 $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");
272 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 477 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 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.",
275 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 479 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
276 );
277
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize;
286 }
287 ); 480 );
288 481
289 $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");
290 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 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.",
293 on_changed => sub { 486 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 487 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 488 &set_gauge_window_fontsize;
489 0
296 } 490 }
297 ); 491 );
298 492
299 $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");
300 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 495 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 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.",
303 on_changed => sub { 497 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 498 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0
306 } 501 }
307 ); 502 );
308 503
309 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
312 on_activate => sub { 507 on_activate => sub {
313 video_shutdown (); 508 video_shutdown ();
314 video_init (); 509 video_init ();
510 0
315 } 511 }
316 ); 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;
317 523
318 $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");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 526 state => $CFG->{audio_enable},
321 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.",
322 on_changed => sub { 528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
323 $CFG->{audio_enable} = $_[1];
324 }
325 ); 529 );
326# $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");
327# $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 {
328# $CFG->{effects_volume} = $_[1]; 532# $CFG->{effects_volume} = $_[1];
329# }); 533# });
330 $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");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 536 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 537 expand => 1, state => $CFG->{bgm_enable},
334 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.",
335 on_changed => sub { 539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
336 $CFG->{bgm_enable} = $_[1];
337 }
338 ); 540 );
339 $hbox->add (new CFClient::UI::Slider 541 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 543 tooltip => "The volume of the background music. Changes are instant.",
342 on_changed => sub { 544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
343 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128;
345 }
346 ); 545 );
347 546
348 $table->add (1, $row++, new CFClient::UI::Button 547 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 548 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 549 tooltip => "Apply the audio settings",
351 on_activate => sub { 550 on_activate => sub {
352 audio_shutdown (); 551 audio_shutdown ();
353 audio_init (); 552 audio_init ();
553 0
354 } 554 }
355 ); 555 );
356 556
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 557 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 on_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370}
371
372sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize});
375 }
376} 558}
377 559
378sub set_gauge_window_fontsize { 560sub set_gauge_window_fontsize {
379 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 561 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
380 $_->set_fontsize ($::CFG->{gauge_fontsize}); 562 $_->set_fontsize ($::CFG->{gauge_fontsize});
383 565
384sub make_gauge_window { 566sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 567 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 568
387 my $win = new CFClient::UI::Frame ( 569 my $win = new CFClient::UI::Frame (
388 req_y => -1, 570 force_x => 0,
571 force_y => "max",
389 user_w => $WIDTH, 572 force_w => $WIDTH,
390 user_h => $gh, 573 force_h => $gh,
391 ); 574 );
392 575
393 $win->add (my $hbox = new CFClient::UI::HBox 576 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 577 children => [
395 (new CFClient::UI::HBox expand => 1), 578 (new CFClient::UI::HBox expand => 1),
431 &set_gauge_window_fontsize; 614 &set_gauge_window_fontsize;
432 615
433 $win 616 $win
434} 617}
435 618
619sub debug_setup {
620 my $table = new CFClient::UI::Table;
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
436sub make_stats_window { 647sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 648 my $vb = new CFClient::UI::VBox;
438 649
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $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,
441 can_hover => 1, can_events => 1, 651 can_hover => 1, can_events => 1,
442 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.");
443 $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,
444 can_hover => 1, can_events => 1, 654 can_hover => 1, can_events => 1,
468 [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."],
469 679
470 [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."],
471 [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."],
472 [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."],
473 [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."],
474 [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."],
475 [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."],
476 ) { 686 ) {
477 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 687 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
478 688
480 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);
481 $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
482 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);
483 } 693 }
484 694
485 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
486 696
487 my $row = 0; 697 my $row = 0;
488 my $col = 0; 698 my $col = 0;
489 699
490 my %resist_names = ( 700 my %resist_names = (
701 slow => ["Slow",
491 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",
492 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",
493 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",
494 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",
495 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",
496 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",
497 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",
498 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",
499 pois => "<b>Poison</b> (resistance to getting poisoned)", 718 "<b>Poison</b> (resistance to getting poisoned)"],
719 para => ["Paralysation",
500 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",
501 deat => "<b>Death</b> (resistance against death spells)", 722 "<b>Death</b> (resistance against death spells)"],
502 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",
503 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",
504 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",
505 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",
506 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",
507 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",
508 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)"],
509 ); 737 );
510 for (qw/slow holyw conf fire depl magic 738 for (qw/slow holyw conf fire depl magic
511 drain acid pois para deat phys 739 drain acid pois para deat phys
512 blind fear tund elec cold ghit/) 740 blind fear tund elec cold ghit/)
513 { 741 {
518 template => "-100%", 746 template => "-100%",
519 align => +1, 747 align => +1,
520 valign => 0, 748 valign => 0,
521 can_events => 1, 749 can_events => 1,
522 can_hover => 1, 750 can_hover => 1,
523 tooltip => $resist_names{$_}, 751 tooltip => $resist_names{$_}->[1],
524 ); 752 );
525 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
526 font => $FONT_FIXED, 754 font => $FONT_FIXED,
527 can_hover => 1, 755 can_hover => 1,
528 can_events => 1, 756 can_events => 1,
529 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
530 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],
531 ); 766 );
532 767
533 $row++; 768 $row++;
534 if ($row % 6 == 0) { 769 if ($row % 6 == 0) {
535 $col += 2; 770 $col += 3;
536 $row = 0; 771 $row = 0;
537 } 772 }
538 } 773 }
539 774
540 &set_stats_window_fontsize;
541 update_stats_window ({}); 775 update_stats_window ({});
542 776
543 $tgw 777 $vb
544} 778}
545 779
780sub skill_window {
781 my ($self) = @_;
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
783}
784
546sub formsep { 785sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 787}
549 788
550sub update_stats_window { 789sub update_stats_window {
551 my ($stats) = @_; 790 my ($stats) = @_;
552 791
582 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
583 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
584 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
585 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
586 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
587 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
588 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
589 $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});
590 829
591 $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);
592 831
593 # TODO: replace by CS_STAT_RES_xxx constants
594 my %tbl = ( 832 my %tbl = (
595 phys => 100, 833 phys => CS_STAT_RES_PHYS,
596 magic => 101, 834 magic => CS_STAT_RES_MAG,
597 fire => 102, 835 fire => CS_STAT_RES_FIRE,
598 elec => 103, 836 elec => CS_STAT_RES_ELEC,
599 cold => 104, 837 cold => CS_STAT_RES_COLD,
600 conf => 105, 838 conf => CS_STAT_RES_CONF,
601 acid => 106, 839 acid => CS_STAT_RES_ACID,
602 drain => 107, 840 drain => CS_STAT_RES_DRAIN,
603 ghit => 108, 841 ghit => CS_STAT_RES_GHOSTHIT,
604 pois => 109, 842 pois => CS_STAT_RES_POISON,
605 slow => 110, 843 slow => CS_STAT_RES_SLOW,
606 para => 111, 844 para => CS_STAT_RES_PARA,
607 tund => 112, 845 tund => CS_STAT_TURN_UNDEAD,
608 fear => 113, 846 fear => CS_STAT_RES_FEAR,
609 depl => 113, 847 depl => CS_STAT_RES_DEPLETE,
610 deat => 115, 848 deat => CS_STAT_RES_DEATH,
611 holyw => 116, 849 holyw => CS_STAT_RES_HOLYWORD,
612 blind => 117, 850 blind => CS_STAT_RES_BLIND,
613 ); 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 }
614 889
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 891 for keys %tbl;
617} 892}
618 893
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627}
628
629my $METASERVER_ATIME; 894my $METASERVER_ATIME;
630 895
631sub update_metaserver { 896sub update_metaserver {
632 my ($HOST) = @_; 897 my ($metaserver_dialog) = @_;
898
899 $METASERVER = $metaserver_dialog
900 if defined $metaserver_dialog;
633 901
634 return if $METASERVER_ATIME > time; 902 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 903 $METASERVER_ATIME = time + 60;
636 904
637 my $table = $METASERVER->{table}; 905 my $table = $METASERVER->{table};
659 927
660 utf8::decode $buf if utf8::valid $buf; 928 utf8::decode $buf if utf8::valid $buf;
661 929
662 $table->clear; 930 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 939 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 944 for 0 .. $#col;
667 945
668 my @align = qw(1 0 1 1 -1); 946 my @align = qw(1 0 1 1 -1);
669 947
670 my $y = 0; 948 my $y = 0;
671 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) {
688 966
689 $m = [$users, $host, $uptime, $version, $desc]; 967 $m = [$users, $host, $uptime, $version, $desc];
690 968
691 $y++; 969 $y++;
692 970
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 971 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST->set_text ($CFG->{host} = $host); 976 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
977 $METASERVER->hide;
978 0
979 },
696 }), 980 ),
697 (new CFClient::UI::Empty expand => 1), 981 (new CFClient::UI::Empty expand => 1),
698 ]); 982 ]);
699 983
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 984 $table->add ($_, $y, new CFClient::UI::Label
701 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)
702 for 0 .. $#$m; 992 for 0 .. $#$m;
703 } 993 }
704 } 994 }
705 }); 995 });
706} 996}
707 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
708sub server_setup { 1022sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 name => "server_setup",
711 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 1023 my $vbox = new CFClient::UI::VBox;
713 1024
714 $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]);
715 $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");
716 1027
717 { 1028 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1029 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 1030
720 $vbox->add ( 1031 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 1032 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 1033 expand => 1,
723 text => $CFG->{host}, 1034 text => $CFG->{profile}{default}{host},
724 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",
725 on_changed => sub { 1036 on_changed => sub {
726 my ($self, $value) = @_; 1037 my ($self, $value) = @_;
727 $CFG->{host} = $value; 1038 $CFG->{profile}{default}{host} = $value;
1039 0
728 } 1040 }
729 ); 1041 );
730 1042
731 $METASERVER = metaserver_dialog;
732
733 $vbox->add (new CFClient::UI::Flopper 1043 $vbox->add (new CFClient::UI::Button
734 expand => 1, 1044 expand => 1,
735 text => "Server List", 1045 text => "Server List",
736 other => $METASERVER, 1046 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 1047 tooltip => "Show a list of available crossfire servers",
738 on_open => sub { 1048 on_activate => sub { $METASERVER->toggle_visibility; 0 },
739 update_metaserver $HOST; 1049 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
740 }
741 ); 1050 );
742 } 1051 }
743 1052
744 $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");
745 $table->add (1, 4, new CFClient::UI::Entry 1054 $table->add (1, 4, new CFClient::UI::Entry
746 text => $CFG->{user}, 1055 text => $CFG->{profile}{default}{user},
747 tooltip => "The name of your character on the server", 1056 tooltip => "The name of your character on the server",
748 on_changed => sub { 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
749 my ($self, $value) = @_;
750 $CFG->{user} = $value;
751 }
752 ); 1058 );
753 1059
754 $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");
755 $table->add (1, 5, new CFClient::UI::Entry 1061 $table->add (1, 5, new CFClient::UI::Entry
756 text => $CFG->{password}, 1062 text => $CFG->{profile}{default}{password},
757 hidden => 1, 1063 hidden => 1,
758 tooltip => "The password for your character", 1064 tooltip => "The password for your character",
759 on_changed => sub { 1065 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
760 my ($self, $value) = @_;
761 $CFG->{password} = $value;
762 }
763 ); 1066 );
764 1067
765 $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");
766 $table->add (1, 7, new CFClient::UI::Slider 1069 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 1070 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1071 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 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. "
770 . "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, "
771 . "but you also increase bandwidth requirements and latency. " 1074 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 1075 . "This option is only used once at log-in.",
773 on_changed => sub { 1076 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
774 my ($self, $value) = @_;
775
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 },
778 ); 1077 );
779 1078
780 $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");
781 $table->add (1, 8, new CFClient::UI::CheckBox 1080 $table->add (1, 8, new CFClient::UI::CheckBox
782 state => $CFG->{face_prefetch}, 1081 state => $CFG->{face_prefetch},
785 . "This might increase or create lag, but increases the chances " 1084 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 1085 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 1086 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 1087 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 1088 . "This option can be set and unset any time.",
790 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1089 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
791 ); 1090 );
792 1091
793 $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");
794 $table->add (1, 9, new CFClient::UI::Entry 1093 $table->add (1, 9, new CFClient::UI::Entry
795 text => $CFG->{output_count}, 1094 text => $CFG->{output_count},
796 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.",
797 on_changed => sub { $CFG->{output_count} = $_[1] }, 1096 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
798 ); 1097 );
799 1098
800 $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");
801 $table->add (1, 10, new CFClient::UI::Entry 1100 $table->add (1, 10, new CFClient::UI::Entry
802 text => $CFG->{output_sync}, 1101 text => $CFG->{output_sync},
803 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.",
804 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1103 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
805 ); 1104 );
806 1105
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1106 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
808 expand => 1, 1107 expand => 1,
809 align => 0, 1108 align => 0,
810 text => "Login", 1109 text => "Login",
811 on_activate => sub { 1110 on_activate => sub {
812 $CONN ? stop_game 1111 $CONN ? stop_game
813 : start_game; 1112 : start_game;
1113 0
814 }, 1114 },
815 ); 1115 );
816 1116
817 $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
818} 1140}
819 1141
820sub message_window { 1142sub message_window {
821 my $window = new CFClient::UI::FancyFrame 1143 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 1144 name => "message_window",
823 title => "Messages", 1145 title => "Messages",
824 border_bg => [1, 1, 1, 1], 1146 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 1147 x => "max",
826 user_w => int $::WIDTH / 3, 1148 y => 0,
1149 force_w => $::WIDTH * 0.4,
827 user_h => int $::HEIGHT / 5, 1150 force_h => $::HEIGHT * 0.5,
828 child => (my $vbox = new CFClient::UI::VBox); 1151 child => (my $vbox = new CFClient::UI::VBox),
1152 has_close_button => 1;
829 1153
830 $vbox->add ($LOGVIEW); 1154 $vbox->add ($LOGVIEW);
831 1155
832 $vbox->add (my $input = new CFClient::UI::Entry 1156 $vbox->add (my $input = new CFClient::UI::Entry
833 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> "
841 1165
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1166 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 1167 $input->{refocus_map} = 1;
844 } 1168 }
845 delete $input->{auto_activated}; 1169 delete $input->{auto_activated};
1170
1171 0
846 }, 1172 },
847 on_activate => sub { 1173 on_activate => sub {
848 my ($input, $text) = @_; 1174 my ($input, $text) = @_;
849 $input->set_text (''); 1175 $input->set_text ('');
850 1176
856 } 1182 }
857 if ($input->{refocus_map}) { 1183 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 1184 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 1185 $MAPWIDGET->focus_in
860 } 1186 }
1187
1188 0
861 }, 1189 },
862 on_escape => sub { 1190 on_escape => sub {
863 $MAPWIDGET->focus_in 1191 $MAPWIDGET->grab_focus;
1192
1193 0
864 }, 1194 },
865 ); 1195 );
866 1196
867 $CONSOLE = { 1197 $CONSOLE = {
868 window => $window, 1198 window => $window,
869 input => $input 1199 input => $input,
870 }; 1200 };
871 1201
872 $window 1202 $window
873} 1203}
874 1204
875sub open_quit_dialog { 1205sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 1206 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1207 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1208 x => "center",
1209 y => "center",
1210 z => 50,
1211 title => "Really Quit?",
1212 ;
879 1213
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1214 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 1215
882 $vb->add (new CFClient::UI::Label 1216 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 1217 text => "You should find a savebed and apply it first!",
886 ); 1220 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1221 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 1222 $hb->add (new CFClient::UI::Button
889 text => "Ok", 1223 text => "Ok",
890 expand => 1, 1224 expand => 1,
891 on_activate => sub { $QUIT_DIALOG->hide }, 1225 on_activate => sub { $QUIT_DIALOG->hide; 0 },
892 ); 1226 );
893 $hb->add (new CFClient::UI::Button 1227 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 1228 text => "Quit anyway",
895 expand => 1, 1229 expand => 1,
896 on_activate => sub { exit }, 1230 on_activate => sub { exit },
897 ); 1231 );
1232 }
898 1233
899 $QUIT_DIALOG->show_centered; 1234 $QUIT_DIALOG->show;
1235}
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
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;
900 } else { 1358 } else {
901 $QUIT_DIALOG->show_centered; 1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
902 } 1361 }
903} 1362}
904 1363
905sub make_inventory_window { 1364sub player_window {
906 my $invwin = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 1366 x => "center",
1367 y => "center",
1368 force_w => $WIDTH * 9/10,
1369 force_h => $HEIGHT * 9/10,
1370 title => "Player",
1371 name => "playerbook",
1372 has_close_button => 1
1373 ;
908 1374
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 ;
1382
1383 $ntb->add (
1384 "Stats" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1391 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 );
1395 $ntb->add (
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 );
1400
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 {
1412 my $binding_list = new CFClient::UI::VBox;
1413
1414 my $refresh;
1415 $refresh = $BIND_UPD_CB = sub {
1416 $binding_list->clear ();
1417
1418 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1422
1423 my $lbl = join "; ", @$cmds;
1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1426 $hb->add (new CFClient::UI::Button
1427 text => "delete",
1428 tooltip => "Deletes the binding",
1429 on_activate => sub {
1430 $binding_list->remove ($hb);
1431 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1432 0
1433 });
910 1434
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1435 $hb->add (new CFClient::UI::Button
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1436 text => "edit",
913 $lbl->set_text ("Player"); 1437 tooltip => "Edits the binding",
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1438 on_activate => sub {
1439 $::BIND_EDITOR->set_binding (
1440 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1441 sub {
1442 my ($nmod, $nsym, $ncmds) = @_;
1443 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1444 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1445 $refresh->();
1446 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1447 $SETUP_DIALOG->show;
1448 },
1449 sub {
1450 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1451 $SETUP_DIALOG->show;
1452 });
1453 $::BIND_EDITOR->show;
1454 $SETUP_DIALOG->hide;
1455 0
1456 });
915 1457
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1458 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1459 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1460 }
1461 }
1462 };
917 1463
1464 my $vb = new CFClient::UI::VBox;
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1465 $vb->add (my $hb = new CFClient::UI::HBox);
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 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
1477 $vb->add ($binding_list);
1478 $vb->add (my $hb = new CFClient::UI::HBox);
1479
920 $hb2->add (new CFClient::UI::Button 1480 $hb->add (new CFClient::UI::Button
921 text => "Close", 1481 text => "record new",
922 tooltip => "Close the currently open container (if one is open)", 1482 expand => 1,
1483 tooltip => "This button opens the binding editor with an empty binding.",
923 on_activate => sub { 1484 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}") 1485 $::BIND_EDITOR->set_binding (undef, undef, [],
925 if $CONN->{open_container} != 0; 1486 sub {
1487 my ($mod, $sym, $cmds) = @_;
1488 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1489 $refresh->();
1490 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1491 $SETUP_DIALOG->show;
1492 },
1493 sub {
1494 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1495 $SETUP_DIALOG->show;
1496 },
1497 );
1498 $SETUP_DIALOG->hide;
1499 $::BIND_EDITOR->show;
1500 0
926 }, 1501 },
927 ); 1502 );
928 1503
929 $INVR_LBL->set_text ("Floor"); 1504 $hb->add (new CFClient::UI::Button
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1505 text => "close",
1506 tooltip => "Closes the binding window",
1507 expand => 1,
1508 on_activate => sub {
1509 $SETUP_DIALOG->hide;
1510 0
1511 }
1512 );
931 1513
932 $invwin 1514 $refresh->();
933}
934 1515
1516 $vb
1517}
1518
935sub make_help_window { 1519sub help_window {
936 my $win = new CFClient::UI::FancyFrame 1520 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1521 x => 'center',
1522 y => 'center',
1523 z => 2,
1524 name => 'doc_browser',
1525 force_w => int $WIDTH * 7/8,
1526 force_h => int $HEIGHT * 7/8,
1527 title => "Help Browser",
1528 has_close_button => 1;
938 1529
939 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
940 1531
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $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);
943 1535
944 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 => [
945 [intro => "Introduction"], 1540 [intro => "Introduction"],
946 [manual => "Manual"], 1541 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"],
1543 [command_help => "Command Reference"],
947 [command_help => "Commands"], 1544 [dmcommand_help => "DM Commands"],
948 [skill_help => "Skills"], 1545 [COPYING => "License Terms"],
949 ) { 1546 ],
950 my ($pod, $label) = @$_; 1547 on_changed => sub {
1548 my ($self, $pod) = @_;
951 1549
952 $buttons->add (new CFClient::UI::Button 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
953 text => $label, 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
954 on_activate => sub {
955 my $parser = new Pod::POM;
956 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
957 1552
958 $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#
959 1559
960 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
961 for @{ CFClient::pod_to_pango_list $pom }; 1561 for @$pom;
962 1562
963 $viewer->set_offset (0); 1563 $viewer->set_offset (0);
1564
964 }, 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 },
965 ); 1574 );
966 }
967
968 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
969 1575
970 $win 1576 $win
971} 1577}
972 1578
973sub sdl_init { 1579sub sdl_init {
1003 if ($DEBUG_STATUS) { 1609 if ($DEBUG_STATUS) {
1004 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1610 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005 } else { 1611 } else {
1006 # create the widgets 1612 # create the widgets
1007 1613
1008 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1614 $DEBUG_STATUS = new CFClient::UI::Label
1615 padding => 0,
1616 z => 100,
1617 force_x => "max",
1618 force_y => 0;
1009 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1010 1620
1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1622
1011 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $STATUSBOX = new CFClient::UI::Statusbox;
1012 $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]);
1013 1625
1014 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
1015 bg => [0, 0, 0, 0.4], 1627 bg => [0, 0, 0, 0.4],
1016 req_y => -1, 1628 force_x => 0,
1629 force_y => "max",
1017 child => $STATUSBOX, 1630 child => $STATUSBOX,
1018 )->show; 1631 )->show;
1019 1632
1020 CFClient::UI::FancyFrame->new ( 1633 CFClient::UI::FancyFrame->new (
1634 title => "Map",
1635 name => "mapmap",
1636 x => 0,
1637 y => $FONTSIZE + 8,
1021 border_bg => [1, 1, 1, 192/255], 1638 border_bg => [1, 1, 1, 192/255],
1022 bg => [1, 1, 1, 0], 1639 bg => [1, 1, 1, 0],
1023 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1640 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1641 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025 ), 1642 ),
1029 $MAPWIDGET->connect (activate_console => sub { 1646 $MAPWIDGET->connect (activate_console => sub {
1030 my ($mapwidget, $preset) = @_; 1647 my ($mapwidget, $preset) = @_;
1031 1648
1032 if ($CONSOLE) { 1649 if ($CONSOLE) {
1033 $CONSOLE->{input}->{auto_activated} = 1; 1650 $CONSOLE->{input}->{auto_activated} = 1;
1034 $CONSOLE->{input}->focus_in; 1651 $CONSOLE->{input}->grab_focus;
1035 1652
1036 if ($preset && $CONSOLE->{input}->get_text eq '') { 1653 if ($preset && $CONSOLE->{input}->get_text eq '') {
1037 $CONSOLE->{input}->set_text ($preset); 1654 $CONSOLE->{input}->set_text ($preset);
1038 } 1655 }
1039 } 1656 }
1040 }); 1657 });
1041 $MAPWIDGET->show; 1658 $MAPWIDGET->show;
1042 $MAPWIDGET->focus_in; 1659 $MAPWIDGET->grab_focus;
1043 1660
1044 $LOGVIEW = new CFClient::UI::TextView 1661 $LOGVIEW = new CFClient::UI::TextScroller
1045 expand => 1, 1662 expand => 1,
1046 font => $FONT_FIXED, 1663 font => $FONT_FIXED,
1047 fontsize => $::CFG->{log_fontsize}, 1664 fontsize => $::CFG->{log_fontsize},
1665 indent => -4,
1048 can_hover => 1, 1666 can_hover => 1,
1049 can_events => 1, 1667 can_events => 1,
1050 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.",
1051 ; 1669 ;
1052 1670
1053 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1054 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
1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1706
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1707 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1056 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.");
1057 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1709
1058 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1059 $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,
1060 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.");
1061 1712
1062 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
1063 1714
1064 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1065 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1067 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.");
1068 1717
1069 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1719 text => "Save Config",
1071 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.",
1072 on_activate => sub { 1721 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1722 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1723 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075 status "Configuration Saved"; 1724 status "Configuration Saved";
1725 0
1076 }, 1726 },
1077 ); 1727 );
1078 1728
1079 $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,
1080 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1081 1731
1082 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1083 text => "Quit", 1733 text => "Quit",
1084 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
1086 if ($CONN) { 1736 if ($CONN) {
1087 open_quit_dialog; 1737 open_quit_dialog;
1088 } else { 1738 } else {
1089 exit; 1739 exit;
1090 } 1740 }
1741 0
1091 }, 1742 },
1092 ); 1743 );
1093 1744
1094 $BUTTONBAR->show; 1745 $BUTTONBAR->show;
1095 1746 $SETUP_DIALOG->show;
1096 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098 # delay till geometry is constant
1099 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101 my $widget = $GAUGES->{win};
1102 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103 });
1104 force_refresh ();
1105 } 1747 }
1748
1749 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1106} 1750}
1107 1751
1108sub video_shutdown { 1752sub video_shutdown {
1753 CFClient::OpenGL::shutdown;
1754
1109 undef $SDL_ACTIVE; 1755 undef $SDL_ACTIVE;
1110} 1756}
1111 1757
1112my @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#
1113my $bgmusic;#TODO#hack#d# 1759my $bgmusic;#TODO#hack#d#
1177 1823
1178my %demo;#d# 1824my %demo;#d#
1179 1825
1180sub force_refresh { 1826sub force_refresh {
1181 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1827 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1182 debug sprintf "%3.2f", $fps; 1828 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183 1829
1184 $CFClient::UI::ROOT->draw; 1830 $CFClient::UI::ROOT->draw;
1185 1831
1186 $WANT_REFRESH = 0; 1832 $WANT_REFRESH = 0;
1187 $CAN_REFRESH = 0; 1833 $CAN_REFRESH = 0;
1242}; 1888};
1243 1889
1244 CFClient::SDL_GL_SwapBuffers; 1890 CFClient::SDL_GL_SwapBuffers;
1245} 1891}
1246 1892
1247my $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 {
1248 $NOW = time; 1894 $NOW = time;
1249 1895
1250 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1896 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1251 for CFClient::SDL_PollEvent; 1897 for CFClient::SDL_PollEvent;
1252 1898
1294# 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#
1295 }, 1941 },
1296 CFClient::SDL_KEYDOWN => sub { 1942 CFClient::SDL_KEYDOWN => sub {
1297 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1943 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1298 # alt-enter 1944 # alt-enter
1945 $FULLSCREEN_ENABLE->toggle;
1299 video_shutdown; 1946 video_shutdown;
1300 $CFG->{fullscreen} = !$CFG->{fullscreen};
1301 video_init; 1947 video_init;
1302 } else { 1948 } else {
1303 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1949 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1304 } 1950 }
1305 }, 1951 },
1319############################################################################# 1965#############################################################################
1320 1966
1321$SIG{INT} = $SIG{TERM} = sub { exit }; 1967$SIG{INT} = $SIG{TERM} = sub { exit };
1322 1968
1323{ 1969{
1324 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 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 };
1325 1975
1326 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327 CFClient::UI::set_layout ($::CFG->{layout}); 1977 CFClient::UI::set_layout ($::CFG->{layout});
1328 1978
1329 my %DEF_CFG = ( 1979 my %DEF_CFG = (
1330 sdl_mode => 0, 1980 sdl_mode => 0,
1331 width => 640, 1981 width => 640,
1332 height => 480, 1982 height => 480,
1333 fullscreen => 0, 1983 fullscreen => 0,
1334 fast => 0, 1984 fast => 0,
1335 map_scale => 1, 1985 map_scale => 1,
1336 fow_enable => 1, 1986 fow_enable => 1,
1337 fow_intensity => 0.45, 1987 fow_intensity => 0.45,
1338 fow_smooth => 0, 1988 fow_smooth => 0,
1339 gui_fontsize => 1, 1989 gui_fontsize => 1,
1340 log_fontsize => 1, 1990 log_fontsize => 0.7,
1341 gauge_fontsize=> 1, 1991 gauge_fontsize => 1,
1342 gauge_size => 0.35, 1992 gauge_size => 0.35,
1343 stat_fontsize => 1, 1993 stat_fontsize => 0.7,
1344 mapsize => 100, 1994 mapsize => 100,
1345 host => "crossfire.schmorp.de",
1346 say_command => 'say', 1995 say_command => 'say',
1347 audio_enable => 1, 1996 audio_enable => 1,
1348 bgm_enable => 1, 1997 bgm_enable => 1,
1349 bgm_volume => 0.25, 1998 bgm_volume => 0.25,
1350 face_prefetch => 0, 1999 face_prefetch => 0,
1351 output_sync => 1, 2000 output_sync => 1,
1352 output_count => 1, 2001 output_count => 1,
2002 pickup => 0,
2003 default => "profile", # default profile
2004 );
1353 ); 2005
1354
1355 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1356 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};
1357 } 2008 }
2009
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1358 2011
1359 sdl_init; 2012 sdl_init;
1360 2013
1361 @SDL_MODES = reverse 2014 @SDL_MODES = reverse
1362 grep $_->[0] >= 640 && $_->[1] >= 480, 2015 grep $_->[0] >= 640 && $_->[1] >= 480,
1404 video_init; 2057 video_init;
1405 audio_init; 2058 audio_init;
1406} 2059}
1407 2060
1408Event::loop; 2061Event::loop;
2062#CFClient::SDL_Quit;
2063#CFClient::_exit 0;
1409 2064
1410END { CFClient::SDL_Quit } 2065END { CFClient::SDL_Quit }
1411 2066
1412=head1 NAME 2067=head1 NAME
1413 2068
1414pclient - A Crossfire+ and Crossfire game client 2069cfplus - A Crossfire+ and Crossfire game client
1415 2070
1416=head1 SYNOPSIS 2071=head1 SYNOPSIS
1417 2072
1418Just run it - no commandline arguments are supported. 2073Just run it - no commandline arguments are supported.
1419 2074
1420=head1 USAGE 2075=head1 USAGE
1421 2076
1422Pclient 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
1423fullscreen and interactively. 2078fullscreen and interactively.
1424 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
1425=head1 AUTHOR 2090=head1 AUTHOR
1426 2091
1427Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2092Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1428 2093
1429 2094

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines