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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines