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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines