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

Diff Legend

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