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.46 by elmex, Fri Jun 2 18:46:16 2006 UTC vs.
Revision 1.76 by root, Tue Jun 20 08:49:40 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines