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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines