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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines