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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines