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.13 by root, Fri May 26 20:50:35 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
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;
659 846
660 utf8::decode $buf if utf8::valid $buf; 847 utf8::decode $buf if utf8::valid $buf;
661 848
662 $table->clear; 849 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 858 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 863 for 0 .. $#col;
667 864
668 my @align = qw(1 0 1 1 -1); 865 my @align = qw(1 0 1 1 -1);
669 866
670 my $y = 0; 867 my $y = 0;
671 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) {
688 885
689 $m = [$users, $host, $uptime, $version, $desc]; 886 $m = [$users, $host, $uptime, $version, $desc];
690 887
691 $y++; 888 $y++;
692 889
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (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 {
695 $HOST->set_text ($CFG->{host} = $host); 895 $HOST_ENTRY->set_text ($CFG->{host} = $host);
896 $METASERVER->hide;
897 },
696 }), 898 ),
697 (new CFClient::UI::Empty expand => 1), 899 (new CFClient::UI::Empty expand => 1),
698 ]); 900 ]);
699 901
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 902 $table->add ($_, $y, new CFClient::UI::Label
701 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)
702 for 0 .. $#$m; 910 for 0 .. $#$m;
703 } 911 }
704 } 912 }
705 }); 913 });
706} 914}
707 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
708sub server_setup { 937sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 938 my $vbox = new CFClient::UI::VBox;
712 939
713 $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]);
714 $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");
715 942
716 { 943 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 945
719 $vbox->add ( 946 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFClient::UI::Entry
721 expand => 1, 948 expand => 1,
722 text => $CFG->{host}, 949 text => $CFG->{host},
723 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",
724 connect_changed => sub { 951 on_changed => sub {
725 my ($self, $value) = @_; 952 my ($self, $value) = @_;
726 $CFG->{host} = $value; 953 $CFG->{host} = $value;
727 } 954 }
728 ); 955 );
729 956
730 $METASERVER = metaserver_dialog; 957 $METASERVER = metaserver_dialog;
731 958
732 $vbox->add (new CFClient::UI::Flopper 959 $vbox->add (new CFClient::UI::Button
733 expand => 1, 960 expand => 1,
734 text => "Server List", 961 text => "Server List",
735 other => $METASERVER, 962 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 963 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 964 on_activate => sub { $METASERVER->toggle_visibility },
738 update_metaserver $HOST; 965 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
739 }
740 ); 966 );
741 } 967 }
742 968
743 $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");
744 $table->add (1, 4, new CFClient::UI::Entry 970 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 971 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 972 tooltip => "The name of your character on the server",
747 connect_changed => sub { 973 on_changed => sub {
748 my ($self, $value) = @_; 974 my ($self, $value) = @_;
749 $CFG->{user} = $value; 975 $CFG->{user} = $value;
750 } 976 }
751 ); 977 );
752 978
753 $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");
754 $table->add (1, 5, new CFClient::UI::Entry 980 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 981 text => $CFG->{password},
756 hidden => 1, 982 hidden => 1,
757 tooltip => "The password for your character", 983 tooltip => "The password for your character",
758 connect_changed => sub { 984 on_changed => sub {
759 my ($self, $value) = @_; 985 my ($self, $value) = @_;
760 $CFG->{password} = $value; 986 $CFG->{password} = $value;
761 } 987 }
762 ); 988 );
763 989
764 $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");
765 $table->add (1, 7, new CFClient::UI::Slider 991 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 992 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 993 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 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. "
769 . "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, "
770 . "but you also increase bandwidth requirements and latency. " 996 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 997 . "This option is only used once at log-in.",
772 connect_changed => sub { 998 on_changed => sub {
773 my ($self, $value) = @_; 999 my ($self, $value) = @_;
774 1000
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 1002 },
777 ); 1003 );
784 . "This might increase or create lag, but increases the chances " 1010 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 1011 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 1012 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 1013 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 1014 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 1016 );
791 1017
792 $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");
793 $table->add (1, 9, new CFClient::UI::Entry 1019 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 1020 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.", 1021 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] }, 1022 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 1023 );
798 1024
799 $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");
800 $table->add (1, 10, new CFClient::UI::Entry 1026 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 1027 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.", 1028 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] }, 1029 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 1030 );
805 1031
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 1033 expand => 1,
808 align => 0, 1034 align => 0,
809 text => "Login", 1035 text => "Login",
810 connect_activate => sub { 1036 on_activate => sub {
811 $CONN ? stop_game 1037 $CONN ? stop_game
812 : start_game; 1038 : start_game;
813 }, 1039 },
814 ); 1040 );
815 1041
816 $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
817} 1055}
818 1056
819sub message_window { 1057sub message_window {
820 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFClient::UI::FancyFrame
1059 name => "message_window",
821 title => "Messages", 1060 title => "Messages",
822 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 1062 bg => [0, 0, 0, 0.75],
824 user_w => int $::WIDTH / 3, 1063 x => "max",
1064 y => 0,
1065 force_w => $::WIDTH * 0.4,
825 user_h => int $::HEIGHT / 5, 1066 force_h => $::HEIGHT * 0.5,
826 child => (my $vbox = new CFClient::UI::VBox); 1067 child => (my $vbox = new CFClient::UI::VBox);
827 1068
828 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
829 1070
830 $vbox->add (my $input = new CFClient::UI::Entry 1071 $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> " 1072 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>...). " 1073 . "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). " 1074 . "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.", 1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 1076 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 1077 my ($input, $prev_focus) = @_;
837 1078
838 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
839 1080
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 1082 $input->{refocus_map} = 1;
842 } 1083 }
843 delete $input->{auto_activated}; 1084 delete $input->{auto_activated};
844 }, 1085 },
845 connect_activate => sub { 1086 on_activate => sub {
846 my ($input, $text) = @_; 1087 my ($input, $text) = @_;
847 $input->set_text (''); 1088 $input->set_text ('');
848 1089
849 if ($text =~ /^\/(.*)/) { 1090 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 1091 $::CONN->user_send ($1);
855 if ($input->{refocus_map}) { 1096 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 1097 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 1098 $MAPWIDGET->focus_in
858 } 1099 }
859 }, 1100 },
860 connect_escape => sub { 1101 on_escape => sub {
861 $MAPWIDGET->focus_in 1102 $MAPWIDGET->focus_in
862 }, 1103 },
863 ); 1104 );
864 1105
865 $CONSOLE = { 1106 $CONSOLE = {
866 window => $window, 1107 window => $window,
867 input => $input 1108 input => $input,
868 }; 1109 };
869 1110
870 $window 1111 $window
871} 1112}
872 1113
873sub open_quit_dialog { 1114sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 1115 unless ($QUIT_DIALOG) {
875
876 $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 ;
877 1122
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 1124
880 $vb->add (new CFClient::UI::Label 1125 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 1126 text => "You should find a savebed and apply it first!",
884 ); 1129 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 1131 $hb->add (new CFClient::UI::Button
887 text => "Ok", 1132 text => "Ok",
888 expand => 1, 1133 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 1134 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 1135 );
891 $hb->add (new CFClient::UI::Button 1136 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 1137 text => "Quit anyway",
893 expand => 1, 1138 expand => 1,
894 connect_activate => sub { exit }, 1139 on_activate => sub { exit },
895 ); 1140 );
896
897 $QUIT_DIALOG->show_centered;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 } 1141 }
901}
902 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
903sub make_inventory_window { 1217sub inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905 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 ;
906 1225
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1226 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908 1227
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1228 $hb->add (my $vb1 = new CFClient::UI::VBox);
910 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1229 $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); 1230 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 1231
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1232 $hb->add (my $vb2 = new CFClient::UI::VBox);
1233
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label align => 0); 1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
916 $INVR_LBL->set_text ("Floor"); 1235
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 1237
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
919 $invwin 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);
1301 $vb->add (my $hb = new CFClient::UI::HBox);
1302
1303 $hb->add (new CFClient::UI::Button
1304 text => "record new",
1305 expand => 1,
1306 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [],
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;
1323 },
1324 );
1325
1326 $hb->add (new CFClient::UI::Button
1327 text => "close",
1328 tooltip => "Closes the binding window",
1329 expand => 1,
1330 on_activate => sub {
1331 $SETUP_DIALOG->hide;
1332 }
1333 );
1334
1335 $refresh->();
1336
1337 $vb
920} 1338}
921 1339
922sub make_help_window { 1340sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame 1341 my $win = new CFClient::UI::FancyFrame
924 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";
925 1349
926 $win->add (my $vbox = new CFClient::UI::VBox); 1350 $win->add (my $vbox = new CFClient::UI::VBox);
927 1351
928 $vbox->add (my $buttons = new CFClient::UI::HBox); 1352 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $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);
936 ) { 1360 ) {
937 my ($pod, $label) = @$_; 1361 my ($pod, $label) = @$_;
938 1362
939 $buttons->add (new CFClient::UI::Button 1363 $buttons->add (new CFClient::UI::Button
940 text => $label, 1364 text => $label,
941 connect_activate => sub { 1365 on_activate => sub {
942 my $parser = new Pod::POM; 1366 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1367 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
944 1368
945 $viewer->clear; 1369 $viewer->clear;
946 1370
947 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1371 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
948 for @{ CFClient::pod_to_pango_list $pom }; 1372 for @$pom;
949 1373
950 $viewer->set_offset (0); 1374 $viewer->set_offset (0);
951 }, 1375 },
952 ); 1376 );
953 } 1377 }
990 if ($DEBUG_STATUS) { 1414 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1415 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1416 } else {
993 # create the widgets 1417 # create the widgets
994 1418
995 $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;
996 $DEBUG_STATUS->show; 1424 $DEBUG_STATUS->show;
997 1425
1426 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1427
998 $STATUSBOX = new CFClient::UI::Statusbox; 1428 $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]); 1429 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1000 1430
1001 (new CFClient::UI::Frame 1431 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1432 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1433 force_x => 0,
1434 force_y => "max",
1004 child => $STATUSBOX, 1435 child => $STATUSBOX,
1005 )->show; 1436 )->show;
1006 1437
1007 CFClient::UI::FancyFrame->new ( 1438 CFClient::UI::FancyFrame->new (
1439 title => "Map",
1440 name => "mapmap",
1441 x => 0,
1442 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1443 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1444 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1445 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.", 1446 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1447 ),
1030 1465
1031 $LOGVIEW = new CFClient::UI::TextView 1466 $LOGVIEW = new CFClient::UI::TextView
1032 expand => 1, 1467 expand => 1,
1033 font => $FONT_FIXED, 1468 font => $FONT_FIXED,
1034 fontsize => $::CFG->{log_fontsize}, 1469 fontsize => $::CFG->{log_fontsize},
1470 indent => -4,
1035 can_hover => 1, 1471 can_hover => 1,
1036 can_events => 1, 1472 can_events => 1,
1037 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.",
1038 ; 1474 ;
1039 1475
1040 $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 ;
1041 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
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1509 $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."); 1510 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, 1511
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, 1512 $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."); 1513 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1048 1514
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 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
1050 1516
1051 $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,
1052 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.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1519 $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 :)."); 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.");
1055 1522
1056 $BUTTONBAR->add (new CFClient::UI::Button 1523 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1524 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.", 1525 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 { 1526 on_activate => sub {
1527 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1528 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1529 status "Configuration Saved";
1062 }, 1530 },
1063 ); 1531 );
1064 1532
1065 $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,
1066 tooltip => "View Documentation"); 1534 tooltip => "View Documentation");
1067 1535
1068 $BUTTONBAR->add (new CFClient::UI::Button 1536 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1537 text => "Quit",
1070 tooltip => "Terminates the program", 1538 tooltip => "Terminates the program",
1071 connect_activate => sub { 1539 on_activate => sub {
1072 if ($CONN) { 1540 if ($CONN) {
1073 open_quit_dialog; 1541 open_quit_dialog;
1074 } else { 1542 } else {
1075 exit; 1543 exit;
1076 } 1544 }
1077 }, 1545 },
1078 ); 1546 );
1079 1547
1080 $BUTTONBAR->show; 1548 $BUTTONBAR->show;
1081 1549 $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 } 1550 }
1551
1552 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1092} 1553}
1093 1554
1094sub video_shutdown { 1555sub video_shutdown {
1095 undef $SDL_ACTIVE; 1556 undef $SDL_ACTIVE;
1096} 1557}
1163 1624
1164my %demo;#d# 1625my %demo;#d#
1165 1626
1166sub force_refresh { 1627sub force_refresh {
1167 $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;
1168 debug sprintf "%3.2f", $fps; 1629 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1630
1170 $CFClient::UI::ROOT->draw; 1631 $CFClient::UI::ROOT->draw;
1171 1632
1172 $WANT_REFRESH = 0; 1633 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1634 $CAN_REFRESH = 0;
1228}; 1689};
1229 1690
1230 CFClient::SDL_GL_SwapBuffers; 1691 CFClient::SDL_GL_SwapBuffers;
1231} 1692}
1232 1693
1233my $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 {
1234 $NOW = time; 1695 $NOW = time;
1235 1696
1236 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1697 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1237 for CFClient::SDL_PollEvent; 1698 for CFClient::SDL_PollEvent;
1238 1699
1305############################################################################# 1766#############################################################################
1306 1767
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1768$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1769
1309{ 1770{
1310 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 };
1311 1776
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1777 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1778 CFClient::UI::set_layout ($::CFG->{layout});
1313 1779
1314 my %DEF_CFG = ( 1780 my %DEF_CFG = (
1315 sdl_mode => 0, 1781 sdl_mode => 0,
1316 width => 640, 1782 width => 640,
1317 height => 480, 1783 height => 480,
1320 map_scale => 1, 1786 map_scale => 1,
1321 fow_enable => 1, 1787 fow_enable => 1,
1322 fow_intensity => 0.45, 1788 fow_intensity => 0.45,
1323 fow_smooth => 0, 1789 fow_smooth => 0,
1324 gui_fontsize => 1, 1790 gui_fontsize => 1,
1325 log_fontsize => 1, 1791 log_fontsize => 0.7,
1326 gauge_fontsize=> 1, 1792 gauge_fontsize=> 1,
1327 gauge_size => 0.35, 1793 gauge_size => 0.35,
1328 stat_fontsize => 1, 1794 stat_fontsize => 0.7,
1329 mapsize => 100, 1795 mapsize => 100,
1330 host => "crossfire.schmorp.de", 1796 host => "crossfire.schmorp.de",
1331 say_command => 'say', 1797 say_command => 'say',
1332 audio_enable => 1, 1798 audio_enable => 1,
1333 bgm_enable => 1, 1799 bgm_enable => 1,
1334 bgm_volume => 0.25, 1800 bgm_volume => 0.25,
1335 face_prefetch => 0, 1801 face_prefetch => 0,
1336 output_sync => 1, 1802 output_sync => 1,
1337 output_count => 1, 1803 output_count => 1,
1804 pickup => 0,
1338 ); 1805 );
1339 1806
1340 while (my ($k, $v) = each %DEF_CFG) { 1807 while (my ($k, $v) = each %DEF_CFG) {
1341 $CFG->{$k} = $v unless exists $CFG->{$k}; 1808 $CFG->{$k} = $v unless exists $CFG->{$k};
1342 } 1809 }
1394 1861
1395END { CFClient::SDL_Quit } 1862END { CFClient::SDL_Quit }
1396 1863
1397=head1 NAME 1864=head1 NAME
1398 1865
1399pclient - A Crossfire+ and Crossfire game client 1866cfplus - A Crossfire+ and Crossfire game client
1400 1867
1401=head1 SYNOPSIS 1868=head1 SYNOPSIS
1402 1869
1403Just run it - no commandline arguments are supported. 1870Just run it - no commandline arguments are supported.
1404 1871
1405=head1 USAGE 1872=head1 USAGE
1406 1873
1407Pclient 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
1408fullscreen and interactively. 1875fullscreen and interactively.
1409 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
1410=head1 AUTHOR 1887=head1 AUTHOR
1411 1888
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1889Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 1890
1414 1891

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines