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.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines