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.54 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.97 by elmex, Wed Jul 19 16:41:51 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
176 382
177sub stop_game { 383sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
180 $SETUP_DIALOG->show; 386 $SETUP_DIALOG->show;
181 $INV_WINDOW->hide; 387 $PL_WINDOW->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 $r =
447 y => $HEIGHT * (2/8), 650 new CFClient::UI::ScrolledWindow (
448 x => "max", 651 expand => 1,
449 title => "Stats", 652 scroll_y => 1
450 name => "stats_window"; 653 );
654 $r->add (my $vb = new CFClient::UI::VBox);
451 655
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, 656 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
454 can_hover => 1, can_events => 1, 657 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."); 658 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, 659 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
457 can_hover => 1, can_events => 1, 660 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."], 684 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
482 685
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."], 686 [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."], 687 [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."], 688 [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."], 689 [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."], 690 [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."], 691 [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 ) { 692 ) {
490 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 693 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
491 694
493 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 696 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 697 $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); 698 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
496 } 699 }
497 700
498 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 701 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
499 702
500 my $row = 0; 703 my $row = 0;
501 my $col = 0; 704 my $col = 0;
502 705
503 my %resist_names = ( 706 my %resist_names = (
707 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.)", 708 "<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.)"],
709 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.)", 710 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
711 conf => ["Confusion",
506 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 712 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
713 fire => ["Fire",
507 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 714 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
715 depl => ["Depletion",
508 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 716 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
717 magic => ["Magic",
509 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 718 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
719 drain => ["Draining",
510 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 720 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
721 acid => ["Acid",
511 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
723 pois => ["Poison",
512 pois => "<b>Poison</b> (resistance to getting poisoned)", 724 "<b>Poison</b> (resistance to getting poisoned)"],
725 para => ["Paralysation",
513 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 726 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
727 deat => ["Death",
514 deat => "<b>Death</b> (resistance against death spells)", 728 "<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)", 729 phys => ["Physical",
730 "<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.)"],
731 blind => ["Blind",
516 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 732 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
733 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)", 734 "<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)"],
735 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...", 736 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
737 elec => ["Electricity",
519 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 738 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
739 cold => ["Cold",
520 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 740 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
741 ghit => ["Ghost hit",
521 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 742 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
522 ); 743 );
523 for (qw/slow holyw conf fire depl magic 744 for (qw/slow holyw conf fire depl magic
524 drain acid pois para deat phys 745 drain acid pois para deat phys
525 blind fear tund elec cold ghit/) 746 blind fear tund elec cold ghit/)
526 { 747 {
531 template => "-100%", 752 template => "-100%",
532 align => +1, 753 align => +1,
533 valign => 0, 754 valign => 0,
534 can_events => 1, 755 can_events => 1,
535 can_hover => 1, 756 can_hover => 1,
536 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
537 ); 758 );
538 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 759 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
539 font => $FONT_FIXED, 760 font => $FONT_FIXED,
540 can_hover => 1, 761 can_hover => 1,
541 can_events => 1, 762 can_events => 1,
542 image => "ui/resist/resist_$_.png", 763 path => "ui/resist/resist_$_.png",
543 tooltip => $resist_names{$_}, 764 tooltip => $resist_names{$_}->[1],
765 );
766 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
767 text => $resist_names{$_}->[0],
768 font => $FONT_FIXED,
769 can_hover => 1,
770 can_events => 1,
771 tooltip => $resist_names{$_}->[1],
544 ); 772 );
545 773
546 $row++; 774 $row++;
547 if ($row % 6 == 0) { 775 if ($row % 6 == 0) {
548 $col += 2; 776 $col += 3;
549 $row = 0; 777 $row = 0;
550 } 778 }
551 } 779 }
552 780
553 &set_stats_window_fontsize;
554 update_stats_window ({}); 781 #update_stats_window ({});
555 782
783 $r
784}
785
786sub skill_window {
787 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
788 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
556 $tgw 789 $sw
557} 790}
558 791
559sub formsep($) { 792sub formsep($) {
560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 793 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
561} 794}
562 795
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; 796my $METASERVER_ATIME;
633 797
634sub update_metaserver { 798sub update_metaserver {
799 my ($metaserver_dialog) = @_;
800
801 $METASERVER = $metaserver_dialog
802 if defined $metaserver_dialog;
803
635 return if $METASERVER_ATIME > time; 804 return if $METASERVER_ATIME > time;
636 $METASERVER_ATIME = time + 60; 805 $METASERVER_ATIME = time + 60;
637 806
638 my $table = $METASERVER->{table}; 807 my $table = $METASERVER->{table};
639 $table->clear; 808 $table->clear;
660 829
661 utf8::decode $buf if utf8::valid $buf; 830 utf8::decode $buf if utf8::valid $buf;
662 831
663 $table->clear; 832 $table->clear;
664 833
834 my @tip = (
835 "The current number of users logged in on the server.",
836 "The hostname of the server.",
837 "The time this server has been running without being restarted.",
838 "The server software version - a '+' indicates a Crossfire+ server.",
839 "Short information about this server provided by its admins.",
840 );
665 my @col = qw(Use #Users Host Uptime Version Description); 841 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 842 $table->add ($_, 0, new CFClient::UI::Label
843 can_hover => 1, can_events => 1,
844 align => 0, fg => [1, 1, 0],
845 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 846 for 0 .. $#col;
668 847
669 my @align = qw(1 0 1 1 -1); 848 my @align = qw(1 0 1 1 -1);
670 849
671 my $y = 0; 850 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 851 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
689 868
690 $m = [$users, $host, $uptime, $version, $desc]; 869 $m = [$users, $host, $uptime, $version, $desc];
691 870
692 $y++; 871 $y++;
693 872
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 873 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 874 (new CFClient::UI::Button
875 text => "Use",
876 tooltip => "Put this server into the <b>Host:Port</b> field",
877 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 878 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697 $METASERVER->toggle_visibility; 879 $METASERVER->hide;
880 0
881 },
698 }), 882 ),
699 (new CFClient::UI::Empty expand => 1), 883 (new CFClient::UI::Empty expand => 1),
700 ]); 884 ]);
701 885
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 886 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 887 ellipsise => 0,
888 align => $align[$_],
889 text => $m->[$_],
890 tooltip => $tip[$_],
891 can_hover => 1,
892 can_events => 1,
893 fontsize => 0.8)
704 for 0 .. $#$m; 894 for 0 .. $#$m;
705 } 895 }
706 } 896 }
707 }); 897 });
708} 898}
709 899
710sub metaserver_dialog { 900sub metaserver_dialog {
901 my $vbox = new CFClient::UI::VBox;
902 my $table = new CFClient::UI::Table;
903 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
904
711 my $dialog = new CFClient::UI::FancyFrame 905 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 906 title => "Server List",
713 name => 'metaserver_dialog', 907 name => 'metaserver_dialog',
714 x => 'center', 908 x => 'center',
715 y => 'center', 909 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox), 910 z => 3,
911 force_h => $::HEIGHT * 0.4,
912 child => $vbox,
913 has_close_button => 1,
914 table => $table,
717 on_visibility_change => sub { 915 on_visibility_change => sub {
718 update_metaserver if $_[1]; 916 update_metaserver ($_[0]) if $_[1];
917 0
719 }, 918 },
720 ; 919 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723 920
724 $dialog 921 $dialog
725} 922}
726 923
727sub server_setup { 924sub server_setup {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 931 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 932
736 $vbox->add ( 933 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 934 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 935 expand => 1,
739 text => $CFG->{host}, 936 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 937 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 938 on_changed => sub {
742 my ($self, $value) = @_; 939 my ($self, $value) = @_;
743 $CFG->{host} = $value; 940 $CFG->{profile}{default}{host} = $value;
941 0
744 } 942 }
745 ); 943 );
746
747 $METASERVER = metaserver_dialog;
748 944
749 $vbox->add (new CFClient::UI::Button 945 $vbox->add (new CFClient::UI::Button
750 expand => 1, 946 expand => 1,
751 text => "Server List", 947 text => "Server List",
752 other => $METASERVER, 948 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 949 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 950 on_activate => sub { $METASERVER->toggle_visibility; 0 },
951 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 952 );
756 } 953 }
757 954
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 955 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 956 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 957 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 958 tooltip => "The name of your character on the server",
762 on_changed => sub { 959 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 960 );
767 961
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 962 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 963 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 964 text => $CFG->{profile}{default}{password},
771 hidden => 1, 965 hidden => 1,
772 tooltip => "The password for your character", 966 tooltip => "The password for your character",
773 on_changed => sub { 967 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 968 );
778 969
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 970 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 971 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 972 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 973 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 974 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, " 975 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 976 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 977 . "This option is only used once at log-in.",
787 on_changed => sub { 978 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 ); 979 );
793 980
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 981 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 982 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 983 state => $CFG->{face_prefetch},
799 . "This might increase or create lag, but increases the chances " 986 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 987 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 988 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 989 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 990 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 991 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 992 );
806 993
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 995 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 996 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.", 997 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] }, 998 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 999 );
813 1000
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1002 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1003 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.", 1004 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] }, 1005 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1006 );
820 1007
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1009 expand => 1,
823 align => 0, 1010 align => 0,
824 text => "Login", 1011 text => "Login",
825 on_activate => sub { 1012 on_activate => sub {
826 $CONN ? stop_game 1013 $CONN ? stop_game
827 : start_game; 1014 : start_game;
1015 0
828 }, 1016 },
829 ); 1017 );
830 1018
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1019 $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 1020 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1023 . "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.", 1024 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1025 on_changed => sub {
838 my ($self, $value) = @_; 1026 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1027 $CFG->{say_command} = $value;
1028 0
840 } 1029 }
841 ); 1030 );
1031
1032 $vbox->add (new CFClient::UI::Label
1033 text => "Server Info",
1034 fontsize => 1.2,
1035 padding_y => 8,
1036 fg => [1, 1, 0, 1],
1037 );
1038
1039 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1040
843 $vbox 1041 $vbox
844} 1042}
845 1043
846sub message_window { 1044sub message_window {
847 my $window = new CFClient::UI::FancyFrame 1045 my $window = new CFClient::UI::FancyFrame
848 name => "message_window", 1046 name => "message_window",
849 title => "Messages", 1047 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1048 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75],
852 x => "max", 1049 x => "max",
853 y => 0, 1050 y => 0,
854 force_w => $::WIDTH / 3, 1051 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1052 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1053 child => (my $vbox = new CFClient::UI::VBox),
1054 has_close_button => 1;
857 1055
858 $vbox->add ($LOGVIEW); 1056 $vbox->add ($LOGVIEW);
859 1057
860 $vbox->add (my $input = new CFClient::UI::Entry 1058 $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> " 1059 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
869 1067
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1068 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1069 $input->{refocus_map} = 1;
872 } 1070 }
873 delete $input->{auto_activated}; 1071 delete $input->{auto_activated};
1072
1073 0
874 }, 1074 },
875 on_activate => sub { 1075 on_activate => sub {
876 my ($input, $text) = @_; 1076 my ($input, $text) = @_;
877 $input->set_text (''); 1077 $input->set_text ('');
878 1078
884 } 1084 }
885 if ($input->{refocus_map}) { 1085 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1086 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1087 $MAPWIDGET->focus_in
888 } 1088 }
1089
1090 0
889 }, 1091 },
890 on_escape => sub { 1092 on_escape => sub {
891 $MAPWIDGET->focus_in 1093 $MAPWIDGET->grab_focus;
1094
1095 0
892 }, 1096 },
893 ); 1097 );
894 1098
895 $CONSOLE = { 1099 $CONSOLE = {
896 window => $window, 1100 window => $window,
903sub open_quit_dialog { 1107sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1108 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1109 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1110 x => "center",
907 y => "center", 1111 y => "center",
1112 z => 50,
908 title => "Really Quit?", 1113 title => "Really Quit?",
909 ; 1114 ;
910 1115
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1116 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1117
917 ); 1122 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1123 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1124 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1125 text => "Ok",
921 expand => 1, 1126 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1127 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1128 );
924 $hb->add (new CFClient::UI::Button 1129 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1130 text => "Quit anyway",
926 expand => 1, 1131 expand => 1,
927 on_activate => sub { exit }, 1132 on_activate => sub { exit },
934sub autopickup_setup { 1139sub autopickup_setup {
935 my $table = new CFClient::UI::Table; 1140 my $table = new CFClient::UI::Table;
936 1141
937 for ( 1142 for (
938 ["General", 0, 0, 1143 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1145 ["Inhibit autopickup" => PICKUP_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1146 ["Stop before pickup" => PICKUP_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1147 ["Debug autopickup" => PICKUP_DEBUG],
943 ], 1148 ],
944 ["Weapons", 0, 6, 1149 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1150 ["All weapons" => PICKUP_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1151 ["Missile weapons" => PICKUP_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW], 1152 ["Bows" => PICKUP_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW], 1153 ["Arrows" => PICKUP_ARROW],
949 ], 1154 ],
950 ["Armour", 0, 12, 1155 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET], 1156 ["Helmets" => PICKUP_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD], 1157 ["Shields" => PICKUP_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1158 ["Body Armour" => PICKUP_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS], 1159 ["Boots" => PICKUP_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1160 ["Gloves" => PICKUP_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1161 ["Cloaks" => PICKUP_CLOAK],
957 ], 1162 ],
958 1163
959 ["Readables", 2, 2, 1164 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1165 ["Spellbooks" => PICKUP_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1166 ["Skillscrolls" => PICKUP_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1167 ["Normal Books/Scrolls" => PICKUP_READABLES],
963 ], 1168 ],
964 ["Misc", 2, 7, 1169 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD], 1170 ["Food" => PICKUP_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK], 1171 ["Drinks" => PICKUP_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1172 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY], 1173 ["Keys" => PICKUP_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1174 ["Magical Items" => PICKUP_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION], 1175 ["Potions" => PICKUP_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1177 ["Ignore cursed" => PICKUP_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1178 ["Jewelery" => PICKUP_JEWELS],
974 ], 1179 ],
1180 ["Weight/Value ratio", 2, 17]
975 ) 1181 )
976 { 1182 {
977 my ($title, $x, $y, @bits) = @$_; 1183 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1184 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979 1185
980 for (@bits) { 1186 for (@bits) {
981 ++$y; 1187 ++$y;
982 1188
983 my $mask = $_->[1]; 1189 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1190 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1191 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask, 1192 state => $::CFG->{pickup} & $mask,
987 on_changed => sub { 1193 on_changed => sub {
988 my ($box, $value) = @_; 1194 my ($box, $value) = @_;
1195
989 if ($value) { 1196 if ($value) {
990 $::CFG->{pickup} |= $mask; 1197 $::CFG->{pickup} |= $mask;
991 } else { 1198 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1199 $::CFG->{pickup} &= ~$mask;
993 } 1200 }
1201
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1202 $::CONN->send_command ("pickup $::CFG->{pickup}")
995 if defined $::CONN; 1203 if defined $::CONN;
1204
1205 0
996 }); 1206 });
1207
1208 ${$_->[2]} = $checkbox if $_->[2];
997 } 1209 }
998 } 1210 }
999 1211
1212 $table->add (2, 18, new CFClient::UI::ValSlider
1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1214 template => ">= 99",
1215 to_value => sub { ">= " . 5 * $_[0] },
1216 on_changed => sub {
1217 my ($slider, $value) = @_;
1218
1219 $::CFG->{pickup} &= ~0xF;
1220 $::CFG->{pickup} |= int $value
1221 if $value;
1222 1;
1223 });
1224
1225 $table->add (3, 18, new CFClient::UI::Button
1226 text => "set",
1227 on_activate => sub {
1228 $::CONN->send_command ("pickup $::CFG->{pickup}")
1229 if defined $::CONN;
1230 0
1231 });
1232
1000 $table 1233 $table
1001} 1234}
1002 1235
1003sub make_inventory_window { 1236sub inventory_widget {
1237 my $hb = new CFClient::UI::HBox homogeneous => 1;
1238
1239 $hb->add (my $vb1 = new CFClient::UI::VBox);
1240 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1241 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1242 $sw1->add ($INV = new CFClient::UI::Inventory);
1243
1244 $hb->add (my $vb2 = new CFClient::UI::VBox);
1245
1246 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1247
1248 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1249 $sw2->add ($INVR = new CFClient::UI::Inventory);
1250
1251 # XXX: Call after $INVR = ... because set_opencont sets the items
1252 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1253
1254 $hb
1255}
1256
1257sub toggle_player_page {
1258 my ($widget) = @_;
1259
1260 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1261 $PL_WINDOW->hide;
1262 } else {
1263 $PL_NOTEBOOK->set_current_page ($widget);
1264 $PL_WINDOW->show;
1265 }
1266}
1267
1268sub player_window {
1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1269 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center", 1270 x => "center",
1006 y => "center", 1271 y => "center",
1007 force_w => $WIDTH * 9/10, 1272 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10, 1273 force_h => $HEIGHT * 9/10,
1009 title => "Inventory", 1274 title => "Player",
1275 name => "playerbook",
1276 has_close_button => 1
1010 ; 1277 ;
1011 1278
1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1279 my $ntb =
1280 $PL_NOTEBOOK =
1281 new CFClient::UI::Notebook expand => 1, debug => 1;
1013 1282
1014 $hb->add (my $vb1 = new CFClient::UI::VBox); 1283 $ntb->add (
1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1284 "Statistics (F2)" => $STATS_PAGE = stats_window,
1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1285 "Shows statistics, where all your Stats and Resistances are shown."
1286 );
1287 $ntb->add (
1288 "Skills (F3)" => $SKILL_PAGE = skill_window,
1289 "Shows all your Skills."
1290 );
1017 1291
1018 $hb->add (my $vb2 = new CFClient::UI::VBox); 1292 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1293 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1294 $ntb->add (
1295 "Spellbook (F4)" => $spellsw,
1296 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1297 );
1298 $ntb->add (
1299 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1300 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1301 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1302 );
1019 1303
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1304 $ntb->set_current_page ($INVENTORY_PAGE);
1021 1305
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1306 $plwin->add ($ntb);
1023 1307 $plwin
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028} 1308}
1029 1309
1030sub spell_setup { 1310sub update_bindings {
1031 new CFClient::UI::SpellList 1311 $BIND_UPD_CB->() if $BIND_UPD_CB;
1032} 1312}
1033 1313
1034sub keyboard_setup { 1314sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox; 1315 my $binding_list = new CFClient::UI::VBox;
1036 1316
1037 my $refresh; 1317 my $refresh;
1038 $refresh = sub { 1318 $refresh = $BIND_UPD_CB = sub {
1039 $binding_list->clear (); 1319 $binding_list->clear ();
1040 1320
1041 for my $mod (keys %{$::CFG->{bindings}}) { 1321 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1322 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1323 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1324 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045 1325
1046 my $lbl = join "; ", @$cmds; 1326 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1327 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox); 1328 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button 1329 $hb->add (new CFClient::UI::Button
1050 text => "delete", 1330 text => "delete",
1051 tooltip => "Deletes the binding", 1331 tooltip => "Deletes the binding",
1052 on_activate => sub { 1332 on_activate => sub {
1053 $binding_list->remove ($hb); 1333 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym}; 1334 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1335 0
1055 }); 1336 });
1056 1337
1057 $hb->add (new CFClient::UI::Button 1338 $hb->add (new CFClient::UI::Button
1058 text => "edit", 1339 text => "edit",
1059 tooltip => "Edits the binding", 1340 tooltip => "Edits the binding",
1060 on_activate => sub { 1341 on_activate => sub {
1061 $::BIND_EDITOR->set_binding ( 1342 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1343 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1063 sub { 1344 sub {
1064 my ($nmod, $nsym, $ncmds) = @_; 1345 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym}; 1346 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1347 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1067 $refresh->(); 1348 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1349 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show; 1350 $SETUP_DIALOG->show;
1070 }, 1351 },
1071 sub { 1352 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1353 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show; 1354 $SETUP_DIALOG->show;
1074 }); 1355 });
1075 $::BIND_EDITOR->show; 1356 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide; 1357 $SETUP_DIALOG->hide;
1358 0
1077 }); 1359 });
1078 1360
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1361 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1362 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 } 1363 }
1082 } 1364 }
1083 }; 1365 };
1084 1366
1085 my $vb = new CFClient::UI::VBox; 1367 my $vb = new CFClient::UI::VBox;
1368 $vb->add (my $hb = new CFClient::UI::HBox);
1369 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1370 $hb->add (new CFClient::UI::CheckBox
1371 expand => 1,
1372 state => $CFG->{shift_fire_stop},
1373 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1374 on_changed => sub {
1375 my ($cbox, $value) = @_;
1376 $CFG->{shift_fire_stop} = $value;
1377 0
1378 });
1379
1086 $vb->add ($binding_list); 1380 $vb->add ($binding_list);
1087 $vb->add (my $hb = new CFClient::UI::HBox); 1381 $vb->add (my $hb = new CFClient::UI::HBox);
1088 1382
1089 $hb->add (new CFClient::UI::Button 1383 $hb->add (new CFClient::UI::Button
1090 text => "record new", 1384 text => "record new",
1092 tooltip => "This button opens the binding editor with an empty binding.", 1386 tooltip => "This button opens the binding editor with an empty binding.",
1093 on_activate => sub { 1387 on_activate => sub {
1094 $::BIND_EDITOR->set_binding (undef, undef, [], 1388 $::BIND_EDITOR->set_binding (undef, undef, [],
1095 sub { 1389 sub {
1096 my ($mod, $sym, $cmds) = @_; 1390 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1391 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1098 $refresh->(); 1392 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1101 }, 1395 },
1102 sub { 1396 sub {
1104 $SETUP_DIALOG->show; 1398 $SETUP_DIALOG->show;
1105 }, 1399 },
1106 ); 1400 );
1107 $SETUP_DIALOG->hide; 1401 $SETUP_DIALOG->hide;
1108 $::BIND_EDITOR->show; 1402 $::BIND_EDITOR->show;
1403 0
1109 }, 1404 },
1110 ); 1405 );
1111 1406
1112 $hb->add (new CFClient::UI::Button 1407 $hb->add (new CFClient::UI::Button
1113 text => "close", 1408 text => "close",
1114 tooltip => "Closes the binding window", 1409 tooltip => "Closes the binding window",
1115 expand => 1, 1410 expand => 1,
1116 on_activate => sub { 1411 on_activate => sub {
1117 $SETUP_DIALOG->hide; 1412 $SETUP_DIALOG->hide;
1413 0
1118 } 1414 }
1119 ); 1415 );
1120 1416
1121 $refresh->(); 1417 $refresh->();
1122 1418
1123 $vb 1419 $vb
1124} 1420}
1125 1421
1422# just weirdness, pls. ignore
1423sub load_html_page {
1424 my ($viewer, $base) = @_;
1425
1426 $viewer->clear;
1427
1428 require LWP::Simple;
1429 require HTML::Parser;
1430 require URI;
1431
1432 my $page = LWP::Simple::get ($base)
1433 or return;
1434
1435 my @s = { };
1436 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1437
1438 my $parser = HTML::Parser->new (
1439 text_h => [sub {
1440 my ($text) = @_;
1441 $text =~ s/\s+/ /g;
1442 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1443 }, "dtext"],
1444 start_h => [sub {
1445 my ($tag, $attr) = @_;
1446 if ($passthrough{$tag}) {
1447 $s[-1]{text} .= "<$tag>";
1448 } elsif ($tag eq "h1") {
1449 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1450 } elsif ($tag eq "h2") {
1451 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1452 } elsif ($tag eq "h3") {
1453 push @s, { text => "<span size='large'>" };
1454 } elsif ($tag eq "a") {
1455 push @s, { text => "", url => $attr->{href} };
1456 } elsif ($tag eq "p") {
1457 push @s, { };
1458 } elsif ($tag eq "img") {
1459 eval {
1460 push @{$s[-1]{obj}}, new CFClient::UI::Image
1461 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1462 $s[-1]{text} .= "\x{fffc}";
1463 };
1464 }
1465 }, "tagname, attr"],
1466 end_h => [sub {
1467 my ($tag) = @_;
1468 if ($passthrough{$tag}) {
1469 $s[-1]{text} .= "</$tag>";
1470 } elsif ($tag =~ /^h\d$/) {
1471 $s[-1]{text} .= "</span>";
1472 push @s, { };
1473 } elsif ($tag eq "a") {
1474 my $S = pop @s;
1475 $s[-1]{text} .= "\x{fffc}";
1476 push @{$s[-1]{obj}}, new CFClient::UI::Label
1477 fg => [0.8, 0.8, 1],
1478 markup => "<u>$S->{text}</u>",
1479 fontsize => 0.8,
1480 can_events => 1,
1481 can_focus => 1,
1482 on_button_up => sub {
1483 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1484 },
1485 ;
1486 }
1487 }, "tagname"],
1488 );
1489
1490 $parser->parse ($page);
1491 $parser->eof;
1492
1493 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1494 for @s;
1495
1496 $viewer->set_offset (0);
1497}
1498
1126sub make_help_window { 1499sub help_window {
1127 my $win = new CFClient::UI::FancyFrame 1500 my $win = new CFClient::UI::FancyFrame
1128 x => 'center', 1501 x => 'center',
1129 y => 'center', 1502 y => 'center',
1503 z => 2,
1130 name => 'doc_browser', 1504 name => 'doc_browser',
1131 force_w => int $WIDTH * 7/8, 1505 force_w => int $WIDTH * 7/8,
1132 force_h => int $HEIGHT * 7/8, 1506 force_h => int $HEIGHT * 7/8,
1133 title => "Documentation"; 1507 title => "Help Browser",
1508 has_close_button => 1;
1134 1509
1135 $win->add (my $vbox = new CFClient::UI::VBox); 1510 $win->add (my $vbox = new CFClient::UI::VBox);
1136 1511
1137 $vbox->add (my $buttons = new CFClient::UI::HBox); 1512 $vbox->add (my $buttons = new CFClient::UI::HBox);
1138 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1513 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1514 expand => 1, fontsize => 0.8, padding_x => 4);
1139 1515
1140 for ( 1516 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1517 $buttons->add (my $combo = new CFClient::UI::Combobox
1518 value => undef,
1519 options => [
1141 [intro => "Introduction"], 1520 [intro => "Introduction"],
1142 [manual => "Manual"], 1521 [manual => "Main Manual"],
1522 [skill_help => "Skill Reference"],
1523 [command_help => "Command Reference"],
1143 [command_help => "Commands"], 1524 [dmcommand_help => "DM Commands"],
1144 [skill_help => "Skills"], 1525 [COPYING => "License Terms"],
1145 ) { 1526 [test => "test (do not select)"], #d#TODO
1146 my ($pod, $label) = @$_; 1527 ],
1528 on_changed => sub {
1529 my ($self, $pod) = @_;
1147 1530
1148 $buttons->add (new CFClient::UI::Button 1531 if ($pod eq "test") {#d#TODO
1149 text => $label, 1532 eval {
1150 on_activate => sub { 1533 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1151 my $parser = new Pod::POM; 1534 };
1152 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1535 warn "$@" if $@;
1536 return;
1537 }
1153 1538
1539 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1540 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1541
1154 $viewer->clear; 1542 $viewer->clear;
1543
1544# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1545# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1546# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1547# ]);#d#
1155 1548
1156 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1549 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157 for @{ CFClient::pod_to_pango_list $pom }; 1550 for @$pom;
1158 1551
1159 $viewer->set_offset (0); 1552 $viewer->set_offset (0);
1553
1160 }, 1554 0
1555 },
1556 on_visibility_change => sub {
1557 my ($self, $visible) = @_;
1558 return unless $visible;
1559 return if $self->{value};
1560 $self->set_value ("intro");
1561 0
1562 },
1161 ); 1563 );
1162 }
1163
1164 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1165 1564
1166 $win 1565 $win
1167} 1566}
1168 1567
1169sub sdl_init { 1568sub sdl_init {
1206 z => 100, 1605 z => 100,
1207 force_x => "max", 1606 force_x => "max",
1208 force_y => 0; 1607 force_y => 0;
1209 $DEBUG_STATUS->show; 1608 $DEBUG_STATUS->show;
1210 1609
1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1610 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1212 1611
1213 $STATUSBOX = new CFClient::UI::Statusbox; 1612 $STATUSBOX = new CFClient::UI::Statusbox;
1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1613 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1215 1614
1216 (new CFClient::UI::Frame 1615 (new CFClient::UI::Frame
1236 $MAPWIDGET->connect (activate_console => sub { 1635 $MAPWIDGET->connect (activate_console => sub {
1237 my ($mapwidget, $preset) = @_; 1636 my ($mapwidget, $preset) = @_;
1238 1637
1239 if ($CONSOLE) { 1638 if ($CONSOLE) {
1240 $CONSOLE->{input}->{auto_activated} = 1; 1639 $CONSOLE->{input}->{auto_activated} = 1;
1241 $CONSOLE->{input}->focus_in; 1640 $CONSOLE->{input}->grab_focus;
1242 1641
1243 if ($preset && $CONSOLE->{input}->get_text eq '') { 1642 if ($preset && $CONSOLE->{input}->get_text eq '') {
1244 $CONSOLE->{input}->set_text ($preset); 1643 $CONSOLE->{input}->set_text ($preset);
1245 } 1644 }
1246 } 1645 }
1247 }); 1646 });
1248 $MAPWIDGET->show; 1647 $MAPWIDGET->show;
1249 $MAPWIDGET->focus_in; 1648 $MAPWIDGET->grab_focus;
1250 1649
1251 $LOGVIEW = new CFClient::UI::TextView 1650 $LOGVIEW = new CFClient::UI::TextScroller
1252 expand => 1, 1651 expand => 1,
1253 font => $FONT_FIXED, 1652 font => $FONT_FIXED,
1254 fontsize => $::CFG->{log_fontsize}, 1653 fontsize => $::CFG->{log_fontsize},
1654 indent => -4,
1255 can_hover => 1, 1655 can_hover => 1,
1256 can_events => 1, 1656 can_events => 1,
1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1657 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258 ; 1658 ;
1259 1659
1263 x => 'center', 1663 x => 'center',
1264 y => 'center', 1664 y => 'center',
1265 z => 2, 1665 z => 2,
1266 force_w => $::WIDTH * 0.6, 1666 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6, 1667 force_h => $::HEIGHT * 0.6,
1668 has_close_button => 1,
1268 ; 1669 ;
1269 1670
1671 $METASERVER = metaserver_dialog;
1672
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1673 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1674 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 1675
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1676 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options."); 1677 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1678 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1679 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1680 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1681 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1682 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music."); 1683 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1684 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings." 1685 "Lets you define, edit and delete key bindings."
1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1686 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you " 1687 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1688 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the " 1689 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes"); 1690 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1691 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1692 "Some debuggin' options. Do not ask.");
1290 1693
1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1694 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292 1695
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1697 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295 1698
1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1699 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1700 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298 1701
1299 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 1702 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
1300 1703
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1704 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1705 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306 1706
1307 $BUTTONBAR->add (new CFClient::UI::Button 1707 $BUTTONBAR->add (new CFClient::UI::Button
1308 text => "Save Config", 1708 text => "Save Config",
1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1709 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310 on_activate => sub { 1710 on_activate => sub {
1311 $::CFG->{layout} = CFClient::UI::get_layout; 1711 $::CFG->{layout} = CFClient::UI::get_layout;
1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1712 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313 status "Configuration Saved"; 1713 status "Configuration Saved";
1714 0
1314 }, 1715 },
1315 ); 1716 );
1316 1717
1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1718 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1318 tooltip => "View Documentation"); 1719 tooltip => "View Documentation");
1319 1720
1320 $BUTTONBAR->add (new CFClient::UI::Button 1721 $BUTTONBAR->add (new CFClient::UI::Button
1321 text => "Quit", 1722 text => "Quit",
1322 tooltip => "Terminates the program", 1723 tooltip => "Terminates the program",
1324 if ($CONN) { 1725 if ($CONN) {
1325 open_quit_dialog; 1726 open_quit_dialog;
1326 } else { 1727 } else {
1327 exit; 1728 exit;
1328 } 1729 }
1730 0
1329 }, 1731 },
1330 ); 1732 );
1331 1733
1332 $BUTTONBAR->show; 1734 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show; 1735 $SETUP_DIALOG->show;
1335 1737
1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1738 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337} 1739}
1338 1740
1339sub video_shutdown { 1741sub video_shutdown {
1742 CFClient::OpenGL::shutdown;
1743
1340 undef $SDL_ACTIVE; 1744 undef $SDL_ACTIVE;
1341} 1745}
1342 1746
1343my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1747my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344my $bgmusic;#TODO#hack#d# 1748my $bgmusic;#TODO#hack#d#
1525# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1929# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1526 }, 1930 },
1527 CFClient::SDL_KEYDOWN => sub { 1931 CFClient::SDL_KEYDOWN => sub {
1528 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1932 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1529 # alt-enter 1933 # alt-enter
1934 $FULLSCREEN_ENABLE->toggle;
1530 video_shutdown; 1935 video_shutdown;
1531 $CFG->{fullscreen} = !$CFG->{fullscreen};
1532 video_init; 1936 video_init;
1533 } else { 1937 } else {
1534 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1938 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1535 } 1939 }
1536 }, 1940 },
1552$SIG{INT} = $SIG{TERM} = sub { exit }; 1956$SIG{INT} = $SIG{TERM} = sub { exit };
1553 1957
1554{ 1958{
1555 local $SIG{__DIE__} = sub { 1959 local $SIG{__DIE__} = sub {
1556 return unless defined $^S && !$^S; 1960 return unless defined $^S && !$^S;
1557 Carp::confess $_[1];#d#TODO: remove when stable 1961 Carp::confess $_[0];#d#TODO: remove when stable
1558 CFClient::fatal $_[0]; 1962 CFClient::fatal $_[0];
1559 }; 1963 };
1560 1964
1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1965 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562 CFClient::UI::set_layout ($::CFG->{layout}); 1966 CFClient::UI::set_layout ($::CFG->{layout});
1563 1967
1564 my %DEF_CFG = ( 1968 my %DEF_CFG = (
1565 sdl_mode => 0, 1969 sdl_mode => 0,
1566 width => 640, 1970 width => 640,
1567 height => 480, 1971 height => 480,
1568 fullscreen => 0, 1972 fullscreen => 0,
1569 fast => 0, 1973 fast => 0,
1570 map_scale => 1, 1974 map_scale => 1,
1571 fow_enable => 1, 1975 fow_enable => 1,
1572 fow_intensity => 0.45, 1976 fow_intensity => 0.45,
1573 fow_smooth => 0, 1977 fow_smooth => 0,
1574 gui_fontsize => 1, 1978 gui_fontsize => 1,
1575 log_fontsize => 1, 1979 log_fontsize => 0.7,
1576 gauge_fontsize=> 1, 1980 gauge_fontsize => 1,
1577 gauge_size => 0.35, 1981 gauge_size => 0.35,
1578 stat_fontsize => 1, 1982 stat_fontsize => 0.7,
1579 mapsize => 100, 1983 mapsize => 100,
1580 host => "crossfire.schmorp.de",
1581 say_command => 'say', 1984 say_command => 'say',
1582 audio_enable => 1, 1985 audio_enable => 1,
1583 bgm_enable => 1, 1986 bgm_enable => 1,
1584 bgm_volume => 0.25, 1987 bgm_volume => 0.25,
1585 face_prefetch => 0, 1988 face_prefetch => 0,
1586 output_sync => 1, 1989 output_sync => 1,
1587 output_count => 1, 1990 output_count => 1,
1991 pickup => 0,
1992 default => "profile", # default profile
1993 );
1588 ); 1994
1589
1590 while (my ($k, $v) = each %DEF_CFG) { 1995 while (my ($k, $v) = each %DEF_CFG) {
1591 $CFG->{$k} = $v unless exists $CFG->{$k}; 1996 $CFG->{$k} = $v unless exists $CFG->{$k};
1592 } 1997 }
1998
1999 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1593 2000
1594 sdl_init; 2001 sdl_init;
1595 2002
1596 @SDL_MODES = reverse 2003 @SDL_MODES = reverse
1597 grep $_->[0] >= 640 && $_->[1] >= 480, 2004 grep $_->[0] >= 640 && $_->[1] >= 480,
1639 video_init; 2046 video_init;
1640 audio_init; 2047 audio_init;
1641} 2048}
1642 2049
1643Event::loop; 2050Event::loop;
2051#CFClient::SDL_Quit;
2052#CFClient::_exit 0;
1644 2053
1645END { CFClient::SDL_Quit } 2054END { CFClient::SDL_Quit }
1646 2055
1647=head1 NAME 2056=head1 NAME
1648 2057

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines