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.12 by root, Fri May 26 19:14:33 2006 UTC vs.
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
86 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
87our $FLOORBOX; 98our $FLOORBOX;
88our $GAUGES; 99our $GAUGES;
89our $STATWIDS; 100our $STATWIDS;
90 101
91our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
97 108
98our $ALT_ENTER_MESSAGE; 109our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 110our $STATUSBOX;
100our $DEBUG_STATUS; 111our $DEBUG_STATUS;
101 112
102our $INVWIN; 113our $INV_WINDOW;
103our $INV; 114our $INV;
104our $INVR; 115our $INVR;
105our $INVR_LBL; 116our $INV_RIGHT_HB;
117
118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
106 121
107sub status { 122sub status {
108 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
109} 124}
110 125
111sub debug { 126sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request; 128}
114 $DEBUG_STATUS->move ($WIDTH - $w, 0); 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
115} 309}
116 310
117sub start_game { 311sub start_game {
118 status "logging in..."; 312 status "logging in...";
313
314 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide;
119 316
120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121 318
122 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
123 320
… …
135 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
136 logview => $LOGVIEW, 333 logview => $LOGVIEW,
137 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
138 map => $MAP, 335 map => $MAP,
139 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
140 338
141 sound_play => sub { 339 sound_play => sub {
142 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
143 341
144 $SDL_MIXER 342 $SDL_MIXER
… …
152 }; 350 };
153 351
154 if ($CONN) { 352 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 353 CFClient::lowdelay fileno $CONN->{fh};
156 354
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 355 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 356 } else {
164 status "unable to connect"; 357 status "unable to connect";
165 stop_game(); 358 stop_game();
166 } 359 }
167} 360}
168 361
169sub stop_game { 362sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide;
367
170 return unless $CONN; 368 return unless $CONN;
171 369
172 status "connection closed"; 370 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 371
372 destroy_query_dialog $CONN;
174 $CONN->destroy; 373 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
176
177 $BUTTONBAR->{children}[1]->emit ("activate")
178 unless $BUTTONBAR->{children}[1]->{state};
179} 375}
180 376
181sub client_setup { 377sub graphics_setup {
182 my $dialog = new CFClient::UI::FancyFrame
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
379
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 381
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 384
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 385 $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]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 386 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 387
193 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 389 my ($self, $value) = @_;
195 390
… …
202 397
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 398 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 399 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 400 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 401 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 402 on_changed => sub {
208 my ($self, $value) = @_; 403 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 404 $CFG->{fullscreen} = $value;
210 } 405 }
211 ); 406 );
212 407
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 408 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 409 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 410 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 411 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 412 on_changed => sub {
218 my ($self, $value) = @_; 413 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 414 $CFG->{fast} = $value;
220 } 415 }
221 ); 416 );
222 417
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 419 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 422 on_changed => sub {
228 my ($self, $value) = @_; 423 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 424 $CFG->{map_scale} = 2 ** $value;
230 } 425 }
231 ); 426 );
232 427
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 428 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 430 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 431 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 432 on_changed => sub {
238 my ($self, $value) = @_; 433 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 434 $CFG->{fow_enable} = $value;
240 } 435 }
241 ); 436 );
242 437
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 438 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 439 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 441 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
247 connect_changed => sub { 442 on_changed => sub {
248 my ($self, $value) = @_; 443 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 444 $CFG->{fow_intensity} = $value;
250 } 445 }
251 ); 446 );
252 447
253 $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");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
256 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.",
257 connect_changed => sub { 452 on_changed => sub {
258 my ($self, $value) = @_; 453 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 456 }
262 ); 457 );
263 458
264 $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");
265 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 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.",
268 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 464 );
270 465
271 $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");
272 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 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.",
275 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 471 );
277 472
278 $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");
279 474
280 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 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.",
283 connect_changed => sub { 478 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
286 } 481 }
287 ); 482 );
288 483
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 485 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 488 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 489 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 490 &set_gauge_window_fontsize;
296 } 491 }
297 ); 492 );
298 493
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 494 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 497 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 498 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 501 }
307 ); 502 );
308 503
309 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
312 connect_activate => sub { 507 on_activate => sub {
313 video_shutdown (); 508 video_shutdown ();
314 video_init (); 509 video_init ();
315 } 510 }
316 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
317 522
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
321 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.", 526 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.",
322 connect_changed => sub { 527 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 528 $CFG->{audio_enable} = $_[1];
324 } 529 }
325 ); 530 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 531# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
327# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 532# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
329# }); 534# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 535 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 539 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 540 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 541 $CFG->{bgm_enable} = $_[1];
337 } 542 }
338 ); 543 );
339 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 547 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 548 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 549 CFClient::MixMusic::volume $_[1] * 128;
345 } 550 }
346 ); 551 );
347 552
348 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
351 connect_activate => sub { 556 on_activate => sub {
352 audio_shutdown (); 557 audio_shutdown ();
353 audio_init (); 558 audio_init ();
354 } 559 }
355 ); 560 );
356 561
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370} 563}
371 564
372sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 576
384sub make_gauge_window { 577sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 579
387 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
388 req_y => -1, 581 force_x => 0,
582 force_y => "max",
389 user_w => $WIDTH, 583 force_w => $WIDTH,
390 user_h => $gh, 584 force_h => $gh,
391 ); 585 );
392 586
393 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 588 children => [
395 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
432 626
433 $win 627 $win
434} 628}
435 629
630
436sub make_stats_window { 631sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 632 my $tgw = new CFClient::UI::FancyFrame
633 y => $HEIGHT * (2/8),
634 x => "max",
635 title => "Stats",
636 name => "stats_window";
438 637
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 638 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 639 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 641 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
445 tooltip => "The map you are currently on (if supported by the server)."); 644 tooltip => "The map you are currently on (if supported by the server).");
446 645
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 646 $vb->add (my $hb0 = new CFClient::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 647 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 648 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 649 tooltip => "The weight of the player including all inventory items.");
451 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 650 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 651 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 652 tooltip => "The weight limit: you cannot carry more than this.");
454 653
455 654
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 655 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 656 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 657
… …
541 update_stats_window ({}); 740 update_stats_window ({});
542 741
543 $tgw 742 $tgw
544} 743}
545 744
546sub formsep { 745sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 747}
549 748
550sub update_stats_window { 749sub update_stats_window {
551 my ($stats) = @_; 750 my ($stats) = @_;
552 751
… …
614 813
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 815 for keys %tbl;
617} 816}
618 817
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627}
628
629my $METASERVER_ATIME; 818my $METASERVER_ATIME;
630 819
631sub update_metaserver { 820sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
636 823
637 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
638 $table->clear; 825 $table->clear;
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 876 $m = [$users, $host, $uptime, $version, $desc];
690 877
691 $y++; 878 $y++;
692 879
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 880 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 881 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 882 $HOST_ENTRY->set_text ($CFG->{host} = $host);
883 $METASERVER->toggle_visibility;
696 }), 884 }),
697 (new CFClient::UI::Empty expand => 1), 885 (new CFClient::UI::Empty expand => 1),
698 ]); 886 ]);
699 887
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 888 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
703 } 891 }
704 } 892 }
705 }); 893 });
706} 894}
707 895
896sub metaserver_dialog {
897 my $dialog = new CFClient::UI::FancyFrame
898 title => "Server List",
899 name => 'metaserver_dialog',
900 x => 'center',
901 y => 'center',
902 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox),
904 on_visibility_change => sub {
905 update_metaserver if $_[1];
906 },
907 ;
908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910
911 $dialog
912}
913
708sub server_setup { 914sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 915 my $vbox = new CFClient::UI::VBox;
712 916
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 917 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 918 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 919
716 { 920 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 922
719 $vbox->add ( 923 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 924 $HOST_ENTRY = new CFClient::UI::Entry
721 expand => 1, 925 expand => 1,
722 text => $CFG->{host}, 926 text => $CFG->{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 927 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 928 on_changed => sub {
725 my ($self, $value) = @_; 929 my ($self, $value) = @_;
726 $CFG->{host} = $value; 930 $CFG->{host} = $value;
727 } 931 }
728 ); 932 );
729 933
730 $METASERVER = metaserver_dialog; 934 $METASERVER = metaserver_dialog;
731 935
732 $vbox->add (new CFClient::UI::Flopper 936 $vbox->add (new CFClient::UI::Button
733 expand => 1, 937 expand => 1,
734 text => "Server List", 938 text => "Server List",
735 other => $METASERVER, 939 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 940 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 941 on_activate => sub { $METASERVER->toggle_visibility },
738 update_metaserver $HOST;
739 }
740 ); 942 );
741 } 943 }
742 944
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 945 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 946 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 947 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 948 tooltip => "The name of your character on the server",
747 connect_changed => sub { 949 on_changed => sub {
748 my ($self, $value) = @_; 950 my ($self, $value) = @_;
749 $CFG->{user} = $value; 951 $CFG->{user} = $value;
750 } 952 }
751 ); 953 );
752 954
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 955 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 957 text => $CFG->{password},
756 hidden => 1, 958 hidden => 1,
757 tooltip => "The password for your character", 959 tooltip => "The password for your character",
758 connect_changed => sub { 960 on_changed => sub {
759 my ($self, $value) = @_; 961 my ($self, $value) = @_;
760 $CFG->{password} = $value; 962 $CFG->{password} = $value;
761 } 963 }
762 ); 964 );
763 965
764 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 966 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
765 $table->add (1, 7, new CFClient::UI::Slider 967 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 968 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 969 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 970 tooltip => "This is the size of the portion of the map update the server sends you. "
769 . "If you set this to a high value you will be able to see further, " 971 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 972 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 973 . "This option is only used once at log-in.",
772 connect_changed => sub { 974 on_changed => sub {
773 my ($self, $value) = @_; 975 my ($self, $value) = @_;
774 976
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 977 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 978 },
777 ); 979 );
… …
784 . "This might increase or create lag, but increases the chances " 986 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 987 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 988 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 989 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 990 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 991 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 992 );
791 993
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 994 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 995 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 996 text => $CFG->{output_count},
795 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 997 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
796 connect_changed => sub { $CFG->{output_count} = $_[1] }, 998 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 999 );
798 1000
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1001 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 1002 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 1003 text => $CFG->{output_sync},
802 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1004 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
803 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1005 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 1006 );
805 1007
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 1009 expand => 1,
808 align => 0, 1010 align => 0,
809 text => "Login", 1011 text => "Login",
810 connect_activate => sub { 1012 on_activate => sub {
811 $CONN ? stop_game 1013 $CONN ? stop_game
812 : start_game; 1014 : start_game;
813 }, 1015 },
814 ); 1016 );
815 1017
816 $dialog 1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1020 text => $CFG->{say_command},
1021 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. "
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub {
1025 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value;
1027 }
1028 );
1029
1030 $vbox
817} 1031}
818 1032
819sub message_window { 1033sub message_window {
820 my $window = new CFClient::UI::FancyFrame 1034 my $window = new CFClient::UI::FancyFrame
1035 name => "message_window",
821 title => "Messages", 1036 title => "Messages",
822 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
824 user_w => int $::WIDTH / 3, 1039 x => "max",
1040 y => 0,
1041 force_w => $::WIDTH * 0.4,
825 user_h => int $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
826 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
827 1044
828 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
829 1046
830 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
831 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1048 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
832 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1049 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
833 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1050 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
834 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1051 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 1052 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 1053 my ($input, $prev_focus) = @_;
837 1054
838 delete $input->{refocus_map}; 1055 delete $input->{refocus_map};
839 1056
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1057 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 1058 $input->{refocus_map} = 1;
842 } 1059 }
843 delete $input->{auto_activated}; 1060 delete $input->{auto_activated};
844 }, 1061 },
845 connect_activate => sub { 1062 on_activate => sub {
846 my ($input, $text) = @_; 1063 my ($input, $text) = @_;
847 $input->set_text (''); 1064 $input->set_text ('');
848 1065
849 if ($text =~ /^\/(.*)/) { 1066 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 1067 $::CONN->user_send ($1);
… …
855 if ($input->{refocus_map}) { 1072 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 1073 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 1074 $MAPWIDGET->focus_in
858 } 1075 }
859 }, 1076 },
860 connect_escape => sub { 1077 on_escape => sub {
861 $MAPWIDGET->focus_in 1078 $MAPWIDGET->focus_in
862 }, 1079 },
863 ); 1080 );
864 1081
865 $CONSOLE = { 1082 $CONSOLE = {
866 window => $window, 1083 window => $window,
867 input => $input 1084 input => $input,
868 }; 1085 };
869 1086
870 $window 1087 $window
871} 1088}
872 1089
873sub open_quit_dialog { 1090sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 1091 unless ($QUIT_DIALOG) {
875
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1093 x => "center",
1094 y => "center",
1095 z => 50,
1096 title => "Really Quit?",
1097 ;
877 1098
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 1100
880 $vb->add (new CFClient::UI::Label 1101 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 1102 text => "You should find a savebed and apply it first!",
… …
884 ); 1105 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 1107 $hb->add (new CFClient::UI::Button
887 text => "Ok", 1108 text => "Ok",
888 expand => 1, 1109 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 1110 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 1111 );
891 $hb->add (new CFClient::UI::Button 1112 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 1113 text => "Quit anyway",
893 expand => 1, 1114 expand => 1,
894 connect_activate => sub { exit }, 1115 on_activate => sub { exit },
895 ); 1116 );
896
897 $QUIT_DIALOG->show_centered;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 } 1117 }
901}
902 1118
1119 $QUIT_DIALOG->show;
1120}
1121
1122sub autopickup_setup {
1123 my $table = new CFClient::UI::Table;
1124
1125 for (
1126 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG],
1131 ],
1132 ["Weapons", 0, 6,
1133 ["All weapons" => PICKUP_ALLWEAPON],
1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1135 ["Bows" => PICKUP_BOW],
1136 ["Arrows" => PICKUP_ARROW],
1137 ],
1138 ["Armour", 0, 12,
1139 ["Helmets" => PICKUP_HELMET],
1140 ["Shields" => PICKUP_SHIELD],
1141 ["Body Armour" => PICKUP_ARMOUR],
1142 ["Boots" => PICKUP_BOOTS],
1143 ["Gloves" => PICKUP_GLOVES],
1144 ["Cloaks" => PICKUP_CLOAK],
1145 ],
1146
1147 ["Readables", 2, 2,
1148 ["Spellbooks" => PICKUP_SPELLBOOK],
1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ],
1152 ["Misc", 2, 7,
1153 ["Food" => PICKUP_FOOD],
1154 ["Drinks" => PICKUP_DRINK],
1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1156 ["Keys" => PICKUP_KEY],
1157 ["Magical Items" => PICKUP_MAGICAL],
1158 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS],
1162 ],
1163 )
1164 {
1165 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167
1168 for (@bits) {
1169 ++$y;
1170
1171 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask,
1175 on_changed => sub {
1176 my ($box, $value) = @_;
1177 if ($value) {
1178 $::CFG->{pickup} |= $mask;
1179 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1181 }
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1183 if defined $::CONN;
1184 });
1185 }
1186 }
1187
1188 $table
1189}
1190
903sub make_inventory_window { 1191sub inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1193 x => "center",
1194 y => "center",
1195 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10,
1197 title => "Inventory",
1198 ;
906 1199
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908 1201
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1202 $hb->add (my $vb1 = new CFClient::UI::VBox);
910 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1204 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 1205
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1206 $hb->add (my $vb2 = new CFClient::UI::VBox);
1207
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
916 $INVR_LBL->set_text ("Floor"); 1209
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 1211
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
919 $invwin 1215 $invwin
1216}
1217
1218sub spell_setup {
1219 new CFClient::UI::SpellList
1220}
1221
1222sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox;
1224
1225 my $refresh;
1226 $refresh = sub {
1227 $binding_list->clear ();
1228
1229 for my $mod (keys %{$::CFG->{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233
1234 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button
1238 text => "delete",
1239 tooltip => "Deletes the binding",
1240 on_activate => sub {
1241 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym};
1243 });
1244
1245 $hb->add (new CFClient::UI::Button
1246 text => "edit",
1247 tooltip => "Edits the binding",
1248 on_activate => sub {
1249 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1251 sub {
1252 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym};
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show;
1258 },
1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show;
1262 });
1263 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide;
1265 });
1266
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 }
1270 }
1271 };
1272
1273 my $vb = new CFClient::UI::VBox;
1274 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox);
1276
1277 $hb->add (new CFClient::UI::Button
1278 text => "record new",
1279 expand => 1,
1280 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub {
1284 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1286 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1289 },
1290 sub {
1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1293 },
1294 );
1295 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show;
1297 },
1298 );
1299
1300 $hb->add (new CFClient::UI::Button
1301 text => "close",
1302 tooltip => "Closes the binding window",
1303 expand => 1,
1304 on_activate => sub {
1305 $SETUP_DIALOG->hide;
1306 }
1307 );
1308
1309 $refresh->();
1310
1311 $vb
920} 1312}
921 1313
922sub make_help_window { 1314sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame 1315 my $win = new CFClient::UI::FancyFrame
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1316 x => 'center',
1317 y => 'center',
1318 z => 2,
1319 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation";
925 1323
926 $win->add (my $vbox = new CFClient::UI::VBox); 1324 $win->add (my $vbox = new CFClient::UI::VBox);
927 1325
928 $vbox->add (my $buttons = new CFClient::UI::HBox); 1326 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
936 ) { 1334 ) {
937 my ($pod, $label) = @$_; 1335 my ($pod, $label) = @$_;
938 1336
939 $buttons->add (new CFClient::UI::Button 1337 $buttons->add (new CFClient::UI::Button
940 text => $label, 1338 text => $label,
941 connect_activate => sub { 1339 on_activate => sub {
942 my $parser = new Pod::POM; 1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
944 1342
945 $viewer->clear; 1343 $viewer->clear;
946 1344
947 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
948 for @{ CFClient::pod_to_pango_list $pom }; 1346 for @$pom;
949 1347
950 $viewer->set_offset (0); 1348 $viewer->set_offset (0);
951 }, 1349 },
952 ); 1350 );
953 } 1351 }
… …
990 if ($DEBUG_STATUS) { 1388 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1389 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1390 } else {
993 # create the widgets 1391 # create the widgets
994 1392
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1393 $DEBUG_STATUS = new CFClient::UI::Label
1394 padding => 0,
1395 z => 100,
1396 force_x => "max",
1397 force_y => 0;
996 $DEBUG_STATUS->show; 1398 $DEBUG_STATUS->show;
997 1399
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1401
998 $STATUSBOX = new CFClient::UI::Statusbox; 1402 $STATUSBOX = new CFClient::UI::Statusbox;
999 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1000 1404
1001 (new CFClient::UI::Frame 1405 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1406 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1407 force_x => 0,
1408 force_y => "max",
1004 child => $STATUSBOX, 1409 child => $STATUSBOX,
1005 )->show; 1410 )->show;
1006 1411
1007 CFClient::UI::FancyFrame->new ( 1412 CFClient::UI::FancyFrame->new (
1413 title => "Map",
1414 name => "mapmap",
1415 x => 0,
1416 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1417 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1418 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1419 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1011 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1420 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1421 ),
… …
1030 1439
1031 $LOGVIEW = new CFClient::UI::TextView 1440 $LOGVIEW = new CFClient::UI::TextView
1032 expand => 1, 1441 expand => 1,
1033 font => $FONT_FIXED, 1442 font => $FONT_FIXED,
1034 fontsize => $::CFG->{log_fontsize}, 1443 fontsize => $::CFG->{log_fontsize},
1444 indent => -4,
1035 can_hover => 1, 1445 can_hover => 1,
1036 can_events => 1, 1446 can_events => 1,
1037 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1447 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1038 ; 1448 ;
1039 1449
1040 $BUTTONBAR = new CFClient::UI::HBox; 1450 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1451 title => "Setup",
1452 name => "setup_dialog",
1453 x => 'center',
1454 y => 'center',
1455 z => 2,
1456 force_w => $::WIDTH * 0.6,
1457 force_h => $::HEIGHT * 0.6,
1458 ;
1041 1459
1460 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1461 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1462
1463 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1464 "Configure the server to play on, your username, password and other server-related options.");
1465 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1466 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1467 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1468 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1469 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1470 "Configure the use of audio, sound effects and background music.");
1471 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1472 "Lets you define, edit and delete bindings."
1473 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1474 . "with nothing set and the recording started. After doing the actions you "
1475 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1476 . "After pressing the combo the binding will be saved automatically and the "
1477 . "binding editor closes");
1478 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1480
1481 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1482
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1483 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1484 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1485
1045 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1046 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1486 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1047 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1487 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1048 1488
1049 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 1489 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
1050 1490
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1491 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1052 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1492 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1493 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1494 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1055 1496
1056 $BUTTONBAR->add (new CFClient::UI::Button 1497 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1498 text => "Save Config",
1058 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1499 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1059 connect_activate => sub { 1500 on_activate => sub {
1501 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1502 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1503 status "Configuration Saved";
1062 }, 1504 },
1063 ); 1505 );
1064 1506
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066 tooltip => "View Documentation"); 1508 tooltip => "View Documentation");
1067 1509
1068 $BUTTONBAR->add (new CFClient::UI::Button 1510 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1511 text => "Quit",
1070 tooltip => "Terminates the program", 1512 tooltip => "Terminates the program",
1071 connect_activate => sub { 1513 on_activate => sub {
1072 if ($CONN) { 1514 if ($CONN) {
1073 open_quit_dialog; 1515 open_quit_dialog;
1074 } else { 1516 } else {
1075 exit; 1517 exit;
1076 } 1518 }
1077 }, 1519 },
1078 ); 1520 );
1079 1521
1080 $BUTTONBAR->show; 1522 $BUTTONBAR->show;
1081 1523 $SETUP_DIALOG->show;
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083
1084 # delay till geometry is constant
1085 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087 my $widget = $GAUGES->{win};
1088 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089 });
1090 force_refresh ();
1091 } 1524 }
1525
1526 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1092} 1527}
1093 1528
1094sub video_shutdown { 1529sub video_shutdown {
1095 undef $SDL_ACTIVE; 1530 undef $SDL_ACTIVE;
1096} 1531}
… …
1163 1598
1164my %demo;#d# 1599my %demo;#d#
1165 1600
1166sub force_refresh { 1601sub force_refresh {
1167 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1602 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1168 debug sprintf "%3.2f", $fps; 1603 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1604
1170 $CFClient::UI::ROOT->draw; 1605 $CFClient::UI::ROOT->draw;
1171 1606
1172 $WANT_REFRESH = 0; 1607 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1608 $CAN_REFRESH = 0;
… …
1228}; 1663};
1229 1664
1230 CFClient::SDL_GL_SwapBuffers; 1665 CFClient::SDL_GL_SwapBuffers;
1231} 1666}
1232 1667
1233my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1668my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1234 $NOW = time; 1669 $NOW = time;
1235 1670
1236 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1671 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1237 for CFClient::SDL_PollEvent; 1672 for CFClient::SDL_PollEvent;
1238 1673
… …
1305############################################################################# 1740#############################################################################
1306 1741
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1742$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1743
1309{ 1744{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1745 local $SIG{__DIE__} = sub {
1746 return unless defined $^S && !$^S;
1747 Carp::confess $_[1];#d#TODO: remove when stable
1748 CFClient::fatal $_[0];
1749 };
1311 1750
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1751 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1752 CFClient::UI::set_layout ($::CFG->{layout});
1313 1753
1314 my %DEF_CFG = ( 1754 my %DEF_CFG = (
1315 sdl_mode => 0, 1755 sdl_mode => 0,
1316 width => 640, 1756 width => 640,
1317 height => 480, 1757 height => 480,
… …
1320 map_scale => 1, 1760 map_scale => 1,
1321 fow_enable => 1, 1761 fow_enable => 1,
1322 fow_intensity => 0.45, 1762 fow_intensity => 0.45,
1323 fow_smooth => 0, 1763 fow_smooth => 0,
1324 gui_fontsize => 1, 1764 gui_fontsize => 1,
1325 log_fontsize => 1, 1765 log_fontsize => 0.7,
1326 gauge_fontsize=> 1, 1766 gauge_fontsize=> 1,
1327 gauge_size => 0.35, 1767 gauge_size => 0.35,
1328 stat_fontsize => 1, 1768 stat_fontsize => 0.7,
1329 mapsize => 100, 1769 mapsize => 100,
1330 host => "crossfire.schmorp.de", 1770 host => "crossfire.schmorp.de",
1331 say_command => 'say', 1771 say_command => 'say',
1332 audio_enable => 1, 1772 audio_enable => 1,
1333 bgm_enable => 1, 1773 bgm_enable => 1,
… …
1394 1834
1395END { CFClient::SDL_Quit } 1835END { CFClient::SDL_Quit }
1396 1836
1397=head1 NAME 1837=head1 NAME
1398 1838
1399pclient - A Crossfire+ and Crossfire game client 1839cfplus - A Crossfire+ and Crossfire game client
1400 1840
1401=head1 SYNOPSIS 1841=head1 SYNOPSIS
1402 1842
1403Just run it - no commandline arguments are supported. 1843Just run it - no commandline arguments are supported.
1404 1844
1405=head1 USAGE 1845=head1 USAGE
1406 1846
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1847cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 1848fullscreen and interactively.
1409 1849
1850=head1 DEBUGGING
1851
1852
1853CFPLUS_DEBUG - environment variable
1854
1855 1 draw borders around widgets
1856 2 add low-level widget info to tooltips
1857 4 show fps
1858 8 suppress tooltips
1859
1410=head1 AUTHOR 1860=head1 AUTHOR
1411 1861
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1862Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 1863
1414 1864

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines