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.15 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.63 by root, Wed Jun 7 05:54:09 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
113our $INV_WINDOW;
102our $INV; 114our $INV;
103our $INVR; 115our $INVR;
104our $INVR_LBL; 116our $INV_RIGHT_HB;
117
118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
105 121
106sub status { 122sub status {
107 $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]);
108} 124}
109 125
110sub debug { 126sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 128}
113 $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;
114} 309}
115 310
116sub start_game { 311sub start_game {
117 status "logging in..."; 312 status "logging in...";
313
314 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide;
118 316
119 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;
120 318
121 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
122 320
… …
134 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 333 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
137 map => $MAP, 335 map => $MAP,
138 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
139 338
140 sound_play => sub { 339 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
142 341
143 $SDL_MIXER 342 $SDL_MIXER
… …
151 }; 350 };
152 351
153 if ($CONN) { 352 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 353 CFClient::lowdelay fileno $CONN->{fh};
155 354
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 355 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 356 } else {
163 status "unable to connect"; 357 status "unable to connect";
164 stop_game(); 358 stop_game();
165 } 359 }
166} 360}
167 361
168sub 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
169 return unless $CONN; 368 return unless $CONN;
170 369
171 status "connection closed"; 370 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 371
372 destroy_query_dialog $CONN;
173 $CONN->destroy; 373 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 375}
179 376
180sub client_setup { 377sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
379
184 $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]);
185 381
186 $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");
187 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
188 384
189 $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]);
190 $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");
191 387
192 $mode_slider->connect (changed => sub { 388 $mode_slider->connect (changed => sub {
193 my ($self, $value) = @_; 389 my ($self, $value) = @_;
194 390
… …
201 397
202 $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");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 399 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 400 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 401 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 402 on_changed => sub {
207 my ($self, $value) = @_; 403 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value; 404 $CFG->{fullscreen} = $value;
209 } 405 }
210 ); 406 );
211 407
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 409 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 410 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 411 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 412 on_changed => sub {
217 my ($self, $value) = @_; 413 my ($self, $value) = @_;
218 $CFG->{fast} = $value; 414 $CFG->{fast} = $value;
219 } 415 }
220 ); 416 );
221 417
222 $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");
223 $table->add (1, $row++, new CFClient::UI::Slider 419 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 422 on_changed => sub {
227 my ($self, $value) = @_; 423 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value; 424 $CFG->{map_scale} = 2 ** $value;
229 } 425 }
230 ); 426 );
231 427
232 $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");
233 $table->add (1, $row++, new CFClient::UI::CheckBox 429 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 430 state => $CFG->{fow_enable},
235 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.",
236 connect_changed => sub { 432 on_changed => sub {
237 my ($self, $value) = @_; 433 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value; 434 $CFG->{fow_enable} = $value;
239 } 435 }
240 ); 436 );
241 437
242 $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");
243 $table->add (1, $row++, new CFClient::UI::Slider 439 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
245 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.",
246 connect_changed => sub { 442 on_changed => sub {
247 my ($self, $value) = @_; 443 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value; 444 $CFG->{fow_intensity} = $value;
249 } 445 }
250 ); 446 );
251 447
252 $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");
253 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
254 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
255 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.",
256 connect_changed => sub { 452 on_changed => sub {
257 my ($self, $value) = @_; 453 my ($self, $value) = @_;
258 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
259 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;
260 } 456 }
261 ); 457 );
262 458
263 $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");
264 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
266 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.",
267 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
268 ); 464 );
269 465
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
273 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.",
274 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
275 ); 471 );
276 472
277 $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");
278 474
279 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
281 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.",
282 connect_changed => sub { 478 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
285 } 481 }
286 ); 482 );
287 483
288 $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");
289 $table->add (1, $row++, new CFClient::UI::Slider 485 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
291 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.",
292 connect_changed => sub { 488 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 489 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 490 &set_gauge_window_fontsize;
295 } 491 }
296 ); 492 );
297 493
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 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.",
302 connect_changed => sub { 498 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
305 } 501 }
306 ); 502 );
307 503
308 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
311 connect_activate => sub { 507 on_activate => sub {
312 video_shutdown (); 508 video_shutdown ();
313 video_init (); 509 video_init ();
314 } 510 }
315 ); 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;
316 522
317 $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");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
320 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.",
321 connect_changed => sub { 527 on_changed => sub {
322 $CFG->{audio_enable} = $_[1]; 528 $CFG->{audio_enable} = $_[1];
323 } 529 }
324 ); 530 );
325# $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");
326# $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 {
327# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
328# }); 534# });
329 $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");
330 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
333 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.",
334 connect_changed => sub { 540 on_changed => sub {
335 $CFG->{bgm_enable} = $_[1]; 541 $CFG->{bgm_enable} = $_[1];
336 } 542 }
337 ); 543 );
338 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 547 on_changed => sub {
342 $CFG->{bgm_volume} = $_[1]; 548 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128; 549 CFClient::MixMusic::volume $_[1] * 128;
344 } 550 }
345 ); 551 );
346 552
347 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
350 connect_activate => sub { 556 on_activate => sub {
351 audio_shutdown (); 557 audio_shutdown ();
352 audio_init (); 558 audio_init ();
353 } 559 }
354 ); 560 );
355 561
356 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
357 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
358 text => $CFG->{say_command},
359 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. "
360 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
361 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
362 connect_changed => sub {
363 my ($self, $value) = @_;
364 $CFG->{say_command} = $value;
365 }
366 );
367
368 $dialog
369} 563}
370 564
371sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
372 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
373 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
382 576
383sub make_gauge_window { 577sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 578 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 579
386 my $win = new CFClient::UI::Frame ( 580 my $win = new CFClient::UI::Frame (
387 req_y => -1, 581 force_x => 0,
582 force_y => "max",
388 user_w => $WIDTH, 583 force_w => $WIDTH,
389 user_h => $gh, 584 force_h => $gh,
390 ); 585 );
391 586
392 $win->add (my $hbox = new CFClient::UI::HBox 587 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 588 children => [
394 (new CFClient::UI::HBox expand => 1), 589 (new CFClient::UI::HBox expand => 1),
… …
430 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
431 626
432 $win 627 $win
433} 628}
434 629
630
435sub make_stats_window { 631sub stats_window {
436 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";
437 637
438 $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);
439 $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,
440 can_hover => 1, can_events => 1, 640 can_hover => 1, can_events => 1,
441 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.");
… …
540 update_stats_window ({}); 740 update_stats_window ({});
541 741
542 $tgw 742 $tgw
543} 743}
544 744
545sub formsep { 745sub formsep($) {
546 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
547} 747}
548 748
549sub update_stats_window { 749sub update_stats_window {
550 my ($stats) = @_; 750 my ($stats) = @_;
551 751
… …
613 813
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615 for keys %tbl; 815 for keys %tbl;
616} 816}
617 817
618sub metaserver_dialog {
619 my $dialog = new CFClient::UI::FancyFrame
620 title => "Server List",
621 child => (my $vbox = new CFClient::UI::VBox);
622
623 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
624
625 $dialog
626}
627
628my $METASERVER_ATIME; 818my $METASERVER_ATIME;
629 819
630sub update_metaserver { 820sub update_metaserver {
631 my ($HOST) = @_;
632
633 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
634 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
635 823
636 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
637 $table->clear; 825 $table->clear;
… …
658 846
659 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
660 848
661 $table->clear; 849 $table->clear;
662 850
851 my @tip = (
852 "The current number of users logged in on the server.",
853 "The hostname of the server.",
854 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.",
857 );
663 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
664 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 859 $table->add ($_, 0, new CFClient::UI::Label
860 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_])
665 for 0 .. $#col; 863 for 0 .. $#col;
666 864
667 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
668 866
669 my $y = 0; 867 my $y = 0;
670 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
687 885
688 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
689 887
690 $y++; 888 $y++;
691 889
692 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
693 (new CFClient::UI::Button text => "Use", connect_activate => sub { 891 (new CFClient::UI::Button
892 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub {
694 $HOST->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
896 $METASERVER->hide;
897 },
695 }), 898 ),
696 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
697 ]); 900 ]);
698 901
699 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
700 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 903 ellipsise => 0,
904 align => $align[$_],
905 text => $m->[$_],
906 tooltip => $tip[$_],
907 can_hover => 1,
908 can_events => 1,
909 fontsize => 0.8)
701 for 0 .. $#$m; 910 for 0 .. $#$m;
702 } 911 }
703 } 912 }
704 }); 913 });
705} 914}
706 915
916sub metaserver_dialog {
917 my $dialog = new CFClient::UI::FancyFrame
918 title => "Server List",
919 name => 'metaserver_dialog',
920 x => 'center',
921 y => 'center',
922 z => 3,
923 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox),
925 on_visibility_change => sub {
926 update_metaserver if $_[1];
927 },
928 ;
929
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933
934 $dialog
935}
936
707sub server_setup { 937sub server_setup {
708 my $dialog = new CFClient::UI::FancyFrame
709 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 938 my $vbox = new CFClient::UI::VBox;
711 939
712 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
713 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
714 942
715 { 943 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
717 945
718 $vbox->add ( 946 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFClient::UI::Entry
720 expand => 1, 948 expand => 1,
721 text => $CFG->{host}, 949 text => $CFG->{host},
722 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
723 connect_changed => sub { 951 on_changed => sub {
724 my ($self, $value) = @_; 952 my ($self, $value) = @_;
725 $CFG->{host} = $value; 953 $CFG->{host} = $value;
726 } 954 }
727 ); 955 );
728 956
729 $METASERVER = metaserver_dialog; 957 $METASERVER = metaserver_dialog;
730 958
731 $vbox->add (new CFClient::UI::Flopper 959 $vbox->add (new CFClient::UI::Button
732 expand => 1, 960 expand => 1,
733 text => "Server List", 961 text => "Server List",
734 other => $METASERVER, 962 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 964 on_activate => sub { $METASERVER->toggle_visibility },
737 update_metaserver $HOST; 965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
738 }
739 ); 966 );
740 } 967 }
741 968
742 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 969 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
743 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 971 text => $CFG->{user},
745 tooltip => "The name of your character on the server", 972 tooltip => "The name of your character on the server",
746 connect_changed => sub { 973 on_changed => sub {
747 my ($self, $value) = @_; 974 my ($self, $value) = @_;
748 $CFG->{user} = $value; 975 $CFG->{user} = $value;
749 } 976 }
750 ); 977 );
751 978
752 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 979 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
753 $table->add (1, 5, new CFClient::UI::Entry 980 $table->add (1, 5, new CFClient::UI::Entry
754 text => $CFG->{password}, 981 text => $CFG->{password},
755 hidden => 1, 982 hidden => 1,
756 tooltip => "The password for your character", 983 tooltip => "The password for your character",
757 connect_changed => sub { 984 on_changed => sub {
758 my ($self, $value) = @_; 985 my ($self, $value) = @_;
759 $CFG->{password} = $value; 986 $CFG->{password} = $value;
760 } 987 }
761 ); 988 );
762 989
763 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 990 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
764 $table->add (1, 7, new CFClient::UI::Slider 991 $table->add (1, 7, new CFClient::UI::Slider
765 req_w => 100, 992 force_w => 100,
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 993 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 tooltip => "This is the size of the portion of the map update the server sends you. " 994 tooltip => "This is the size of the portion of the map update the server sends you. "
768 . "If you set this to a high value you will be able to see further, " 995 . "If you set this to a high value you will be able to see further, "
769 . "but you also increase bandwidth requirements and latency. " 996 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 997 . "This option is only used once at log-in.",
771 connect_changed => sub { 998 on_changed => sub {
772 my ($self, $value) = @_; 999 my ($self, $value) = @_;
773 1000
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 }, 1002 },
776 ); 1003 );
… …
783 . "This might increase or create lag, but increases the chances " 1010 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 1011 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 1012 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 1013 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 1014 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
789 ); 1016 );
790 1017
791 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
792 $table->add (1, 9, new CFClient::UI::Entry 1019 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 1020 text => $CFG->{output_count},
794 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
795 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1022 on_changed => sub { $CFG->{output_count} = $_[1] },
796 ); 1023 );
797 1024
798 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
799 $table->add (1, 10, new CFClient::UI::Entry 1026 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 1027 text => $CFG->{output_sync},
801 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
802 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1029 on_changed => sub { $CFG->{output_sync} = $_[1] },
803 ); 1030 );
804 1031
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 1033 expand => 1,
807 align => 0, 1034 align => 0,
808 text => "Login", 1035 text => "Login",
809 connect_activate => sub { 1036 on_activate => sub {
810 $CONN ? stop_game 1037 $CONN ? stop_game
811 : start_game; 1038 : start_game;
812 }, 1039 },
813 ); 1040 );
814 1041
815 $dialog 1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1044 text => $CFG->{say_command},
1045 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. "
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub {
1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value;
1051 }
1052 );
1053
1054 $vbox
816} 1055}
817 1056
818sub message_window { 1057sub message_window {
819 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
1059 name => "message_window",
820 title => "Messages", 1060 title => "Messages",
821 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
823 user_w => int $::WIDTH / 3, 1063 x => "max",
1064 y => 0,
1065 force_w => $::WIDTH * 0.4,
824 user_h => int $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
825 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
826 1068
827 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
828 1070
829 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFClient::UI::Entry
830 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
831 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1073 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
832 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1074 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
833 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
834 connect_focus_in => sub { 1076 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 1077 my ($input, $prev_focus) = @_;
836 1078
837 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
838 1080
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 1082 $input->{refocus_map} = 1;
841 } 1083 }
842 delete $input->{auto_activated}; 1084 delete $input->{auto_activated};
843 }, 1085 },
844 connect_activate => sub { 1086 on_activate => sub {
845 my ($input, $text) = @_; 1087 my ($input, $text) = @_;
846 $input->set_text (''); 1088 $input->set_text ('');
847 1089
848 if ($text =~ /^\/(.*)/) { 1090 if ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 1091 $::CONN->user_send ($1);
… …
854 if ($input->{refocus_map}) { 1096 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 1097 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 1098 $MAPWIDGET->focus_in
857 } 1099 }
858 }, 1100 },
859 connect_escape => sub { 1101 on_escape => sub {
860 $MAPWIDGET->focus_in 1102 $MAPWIDGET->focus_in
861 }, 1103 },
862 ); 1104 );
863 1105
864 $CONSOLE = { 1106 $CONSOLE = {
865 window => $window, 1107 window => $window,
866 input => $input 1108 input => $input,
867 }; 1109 };
868 1110
869 $window 1111 $window
870} 1112}
871 1113
872sub open_quit_dialog { 1114sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
874
875 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1117 x => "center",
1118 y => "center",
1119 z => 50,
1120 title => "Really Quit?",
1121 ;
876 1122
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 1124
879 $vb->add (new CFClient::UI::Label 1125 $vb->add (new CFClient::UI::Label
880 text => "You should find a savebed and apply it first!", 1126 text => "You should find a savebed and apply it first!",
… …
883 ); 1129 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 1131 $hb->add (new CFClient::UI::Button
886 text => "Ok", 1132 text => "Ok",
887 expand => 1, 1133 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 1134 on_activate => sub { $QUIT_DIALOG->hide },
889 ); 1135 );
890 $hb->add (new CFClient::UI::Button 1136 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 1137 text => "Quit anyway",
892 expand => 1, 1138 expand => 1,
893 connect_activate => sub { exit }, 1139 on_activate => sub { exit },
894 ); 1140 );
895
896 $QUIT_DIALOG->show_centered;
897 } else {
898 $QUIT_DIALOG->show_centered;
899 } 1141 }
900}
901 1142
1143 $QUIT_DIALOG->show;
1144}
1145
1146sub autopickup_setup {
1147 my $table = new CFClient::UI::Table;
1148
1149 for (
1150 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG],
1155 ],
1156 ["Weapons", 0, 6,
1157 ["All weapons" => PICKUP_ALLWEAPON],
1158 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1159 ["Bows" => PICKUP_BOW],
1160 ["Arrows" => PICKUP_ARROW],
1161 ],
1162 ["Armour", 0, 12,
1163 ["Helmets" => PICKUP_HELMET],
1164 ["Shields" => PICKUP_SHIELD],
1165 ["Body Armour" => PICKUP_ARMOUR],
1166 ["Boots" => PICKUP_BOOTS],
1167 ["Gloves" => PICKUP_GLOVES],
1168 ["Cloaks" => PICKUP_CLOAK],
1169 ],
1170
1171 ["Readables", 2, 2,
1172 ["Spellbooks" => PICKUP_SPELLBOOK],
1173 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1174 ["Normal Books/Scrolls" => PICKUP_READABLES],
1175 ],
1176 ["Misc", 2, 7,
1177 ["Food" => PICKUP_FOOD],
1178 ["Drinks" => PICKUP_DRINK],
1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1180 ["Keys" => PICKUP_KEY],
1181 ["Magical Items" => PICKUP_MAGICAL],
1182 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS],
1186 ],
1187 )
1188 {
1189 my ($title, $x, $y, @bits) = @$_;
1190 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1191
1192 for (@bits) {
1193 ++$y;
1194
1195 my $mask = $_->[1];
1196 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1198 state => $CFG->{pickup} & $mask,
1199 on_changed => sub {
1200 my ($box, $value) = @_;
1201
1202 if ($value) {
1203 $::CFG->{pickup} |= $mask;
1204 } else {
1205 $::CFG->{pickup} &= ~$mask;
1206 }
1207
1208 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN;
1210 });
1211 }
1212 }
1213
1214 $table
1215}
1216
902sub make_inventory_window { 1217sub inventory_window {
903 my $invwin = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
904 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1219 x => "center",
1220 y => "center",
1221 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10,
1223 title => "Inventory",
1224 ;
905 1225
906 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
907 1227
908 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1228 $hb->add (my $vb1 = new CFClient::UI::VBox);
909 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
910 $lbl->set_text ("Player");
911 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
912 1231
913 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1232 $hb->add (my $vb2 = new CFClient::UI::VBox);
1233
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1235
1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1237
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
1241 $invwin
1242}
1243
1244sub spell_setup {
1245 new CFClient::UI::SpellList
1246}
1247
1248sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox;
1250
1251 my $refresh;
1252 $refresh = sub {
1253 $binding_list->clear ();
1254
1255 for my $mod (keys %{$::CFG->{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259
1260 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox);
1263 $hb->add (new CFClient::UI::Button
1264 text => "delete",
1265 tooltip => "Deletes the binding",
1266 on_activate => sub {
1267 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym};
1269 });
1270
1271 $hb->add (new CFClient::UI::Button
1272 text => "edit",
1273 tooltip => "Edits the binding",
1274 on_activate => sub {
1275 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1277 sub {
1278 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym};
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1281 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show;
1284 },
1285 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show;
1288 });
1289 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide;
1291 });
1292
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1295 }
1296 }
1297 };
1298
1299 my $vb = new CFClient::UI::VBox;
1300 $vb->add ($binding_list);
914 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1301 $vb->add (my $hb = new CFClient::UI::HBox);
1302
915 $hb2->add (new CFClient::UI::Button 1303 $hb->add (new CFClient::UI::Button
916 text => "Close", 1304 text => "record new",
917 tooltip => "Close the currently open container (if one is open)", 1305 expand => 1,
1306 tooltip => "This button opens the binding editor with an empty binding.",
918 connect_activate => sub { 1307 on_activate => sub {
919 $CONN->send ("apply $CONN->{open_container}") 1308 $::BIND_EDITOR->set_binding (undef, undef, [],
920 if $CONN->{open_container} != 0; 1309 sub {
1310 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1312 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show;
1315 },
1316 sub {
1317 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1318 $SETUP_DIALOG->show;
1319 },
1320 );
1321 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show;
921 }, 1323 },
922 ); 1324 );
923 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
924 1325
925 $INVR_LBL->set_text ("Floor"); 1326 $hb->add (new CFClient::UI::Button
926 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1327 text => "close",
1328 tooltip => "Closes the binding window",
1329 expand => 1,
1330 on_activate => sub {
1331 $SETUP_DIALOG->hide;
1332 }
1333 );
927 1334
928 $invwin 1335 $refresh->();
1336
1337 $vb
929} 1338}
930 1339
931sub make_help_window { 1340sub make_help_window {
932 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
933 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1342 x => 'center',
1343 y => 'center',
1344 z => 2,
1345 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation";
934 1349
935 $win->add (my $vbox = new CFClient::UI::VBox); 1350 $win->add (my $vbox = new CFClient::UI::VBox);
936 1351
937 $vbox->add (my $buttons = new CFClient::UI::HBox); 1352 $vbox->add (my $buttons = new CFClient::UI::HBox);
938 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1353 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
945 ) { 1360 ) {
946 my ($pod, $label) = @$_; 1361 my ($pod, $label) = @$_;
947 1362
948 $buttons->add (new CFClient::UI::Button 1363 $buttons->add (new CFClient::UI::Button
949 text => $label, 1364 text => $label,
950 connect_activate => sub { 1365 on_activate => sub {
951 my $parser = new Pod::POM; 1366 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
952 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1367 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
953 1368
954 $viewer->clear; 1369 $viewer->clear;
955 1370
956 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1371 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
957 for @{ CFClient::pod_to_pango_list $pom }; 1372 for @$pom;
958 1373
959 $viewer->set_offset (0); 1374 $viewer->set_offset (0);
960 }, 1375 },
961 ); 1376 );
962 } 1377 }
… …
999 if ($DEBUG_STATUS) { 1414 if ($DEBUG_STATUS) {
1000 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1415 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1001 } else { 1416 } else {
1002 # create the widgets 1417 # create the widgets
1003 1418
1004 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1419 $DEBUG_STATUS = new CFClient::UI::Label
1420 padding => 0,
1421 z => 100,
1422 force_x => "max",
1423 force_y => 0;
1005 $DEBUG_STATUS->show; 1424 $DEBUG_STATUS->show;
1006 1425
1426 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1427
1007 $STATUSBOX = new CFClient::UI::Statusbox; 1428 $STATUSBOX = new CFClient::UI::Statusbox;
1008 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1429 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1009 1430
1010 (new CFClient::UI::Frame 1431 (new CFClient::UI::Frame
1011 bg => [0, 0, 0, 0.4], 1432 bg => [0, 0, 0, 0.4],
1012 req_y => -1, 1433 force_x => 0,
1434 force_y => "max",
1013 child => $STATUSBOX, 1435 child => $STATUSBOX,
1014 )->show; 1436 )->show;
1015 1437
1016 CFClient::UI::FancyFrame->new ( 1438 CFClient::UI::FancyFrame->new (
1439 title => "Map",
1440 name => "mapmap",
1441 x => 0,
1442 y => $FONTSIZE + 8,
1017 border_bg => [1, 1, 1, 192/255], 1443 border_bg => [1, 1, 1, 192/255],
1018 bg => [1, 1, 1, 0], 1444 bg => [1, 1, 1, 0],
1019 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1445 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1020 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1446 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1021 ), 1447 ),
… …
1039 1465
1040 $LOGVIEW = new CFClient::UI::TextView 1466 $LOGVIEW = new CFClient::UI::TextView
1041 expand => 1, 1467 expand => 1,
1042 font => $FONT_FIXED, 1468 font => $FONT_FIXED,
1043 fontsize => $::CFG->{log_fontsize}, 1469 fontsize => $::CFG->{log_fontsize},
1470 indent => -4,
1044 can_hover => 1, 1471 can_hover => 1,
1045 can_events => 1, 1472 can_events => 1,
1046 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1473 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1047 ; 1474 ;
1048 1475
1049 $BUTTONBAR = new CFClient::UI::HBox; 1476 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1477 title => "Setup",
1478 name => "setup_dialog",
1479 x => 'center',
1480 y => 'center',
1481 z => 2,
1482 force_w => $::WIDTH * 0.6,
1483 force_h => $::HEIGHT * 0.6,
1484 ;
1050 1485
1486 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1487 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1488
1489 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1490 "Configure the server to play on, your username, password and other server-related options.");
1491 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1492 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1493 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1494 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1495 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1496 "Configure the use of audio, sound effects and background music.");
1497 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1498 "Lets you define, edit and delete bindings."
1499 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1500 . "with nothing set and the recording started. After doing the actions you "
1501 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1502 . "After pressing the combo the binding will be saved automatically and the "
1503 . "binding editor closes");
1504 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1505 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1506
1507 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1508
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1509 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1052 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1510 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1511
1054 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1512 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1056 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1057 1514
1058 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 1515 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
1059 1516
1060 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1061 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1518 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1062 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1519 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1063 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1520 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1521 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1064 1522
1065 $BUTTONBAR->add (new CFClient::UI::Button 1523 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1524 text => "Save Config",
1067 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1525 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1068 connect_activate => sub { 1526 on_activate => sub {
1527 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1528 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1070 status "Configuration Saved"; 1529 status "Configuration Saved";
1071 }, 1530 },
1072 ); 1531 );
1073 1532
1074 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1533 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1075 tooltip => "View Documentation"); 1534 tooltip => "View Documentation");
1076 1535
1077 $BUTTONBAR->add (new CFClient::UI::Button 1536 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1537 text => "Quit",
1079 tooltip => "Terminates the program", 1538 tooltip => "Terminates the program",
1080 connect_activate => sub { 1539 on_activate => sub {
1081 if ($CONN) { 1540 if ($CONN) {
1082 open_quit_dialog; 1541 open_quit_dialog;
1083 } else { 1542 } else {
1084 exit; 1543 exit;
1085 } 1544 }
1086 }, 1545 },
1087 ); 1546 );
1088 1547
1089 $BUTTONBAR->show; 1548 $BUTTONBAR->show;
1090 1549 $SETUP_DIALOG->show;
1091 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1092
1093 # delay till geometry is constant
1094 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1095 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1096 my $widget = $GAUGES->{win};
1097 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1098 });
1099 force_refresh ();
1100 } 1550 }
1551
1552 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1101} 1553}
1102 1554
1103sub video_shutdown { 1555sub video_shutdown {
1104 undef $SDL_ACTIVE; 1556 undef $SDL_ACTIVE;
1105} 1557}
… …
1172 1624
1173my %demo;#d# 1625my %demo;#d#
1174 1626
1175sub force_refresh { 1627sub force_refresh {
1176 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1628 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1177 debug sprintf "%3.2f", $fps; 1629 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1178 1630
1179 $CFClient::UI::ROOT->draw; 1631 $CFClient::UI::ROOT->draw;
1180 1632
1181 $WANT_REFRESH = 0; 1633 $WANT_REFRESH = 0;
1182 $CAN_REFRESH = 0; 1634 $CAN_REFRESH = 0;
… …
1237}; 1689};
1238 1690
1239 CFClient::SDL_GL_SwapBuffers; 1691 CFClient::SDL_GL_SwapBuffers;
1240} 1692}
1241 1693
1242my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1694my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1243 $NOW = time; 1695 $NOW = time;
1244 1696
1245 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1697 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1246 for CFClient::SDL_PollEvent; 1698 for CFClient::SDL_PollEvent;
1247 1699
… …
1314############################################################################# 1766#############################################################################
1315 1767
1316$SIG{INT} = $SIG{TERM} = sub { exit }; 1768$SIG{INT} = $SIG{TERM} = sub { exit };
1317 1769
1318{ 1770{
1319 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1771 local $SIG{__DIE__} = sub {
1772 return unless defined $^S && !$^S;
1773 Carp::confess $_[1];#d#TODO: remove when stable
1774 CFClient::fatal $_[0];
1775 };
1320 1776
1321 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1777 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1778 CFClient::UI::set_layout ($::CFG->{layout});
1322 1779
1323 my %DEF_CFG = ( 1780 my %DEF_CFG = (
1324 sdl_mode => 0, 1781 sdl_mode => 0,
1325 width => 640, 1782 width => 640,
1326 height => 480, 1783 height => 480,
… …
1329 map_scale => 1, 1786 map_scale => 1,
1330 fow_enable => 1, 1787 fow_enable => 1,
1331 fow_intensity => 0.45, 1788 fow_intensity => 0.45,
1332 fow_smooth => 0, 1789 fow_smooth => 0,
1333 gui_fontsize => 1, 1790 gui_fontsize => 1,
1334 log_fontsize => 1, 1791 log_fontsize => 0.7,
1335 gauge_fontsize=> 1, 1792 gauge_fontsize=> 1,
1336 gauge_size => 0.35, 1793 gauge_size => 0.35,
1337 stat_fontsize => 1, 1794 stat_fontsize => 0.7,
1338 mapsize => 100, 1795 mapsize => 100,
1339 host => "crossfire.schmorp.de", 1796 host => "crossfire.schmorp.de",
1340 say_command => 'say', 1797 say_command => 'say',
1341 audio_enable => 1, 1798 audio_enable => 1,
1342 bgm_enable => 1, 1799 bgm_enable => 1,
1343 bgm_volume => 0.25, 1800 bgm_volume => 0.25,
1344 face_prefetch => 0, 1801 face_prefetch => 0,
1345 output_sync => 1, 1802 output_sync => 1,
1346 output_count => 1, 1803 output_count => 1,
1804 pickup => 0,
1347 ); 1805 );
1348 1806
1349 while (my ($k, $v) = each %DEF_CFG) { 1807 while (my ($k, $v) = each %DEF_CFG) {
1350 $CFG->{$k} = $v unless exists $CFG->{$k}; 1808 $CFG->{$k} = $v unless exists $CFG->{$k};
1351 } 1809 }
… …
1403 1861
1404END { CFClient::SDL_Quit } 1862END { CFClient::SDL_Quit }
1405 1863
1406=head1 NAME 1864=head1 NAME
1407 1865
1408pclient - A Crossfire+ and Crossfire game client 1866cfplus - A Crossfire+ and Crossfire game client
1409 1867
1410=head1 SYNOPSIS 1868=head1 SYNOPSIS
1411 1869
1412Just run it - no commandline arguments are supported. 1870Just run it - no commandline arguments are supported.
1413 1871
1414=head1 USAGE 1872=head1 USAGE
1415 1873
1416Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1874cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1417fullscreen and interactively. 1875fullscreen and interactively.
1418 1876
1877=head1 DEBUGGING
1878
1879
1880CFPLUS_DEBUG - environment variable
1881
1882 1 draw borders around widgets
1883 2 add low-level widget info to tooltips
1884 4 show fps
1885 8 suppress tooltips
1886
1419=head1 AUTHOR 1887=head1 AUTHOR
1420 1888
1421Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1889Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1422 1890
1423 1891

Diff Legend

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