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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines