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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines