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.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.88 by root, Mon Jul 3 22:04:25 2006 UTC

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

Diff Legend

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