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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines