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.14 by elmex, Sat May 27 08:45:24 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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
… …
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 49 CFClient::error $_[1];
47}; 50};
48 51
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 53
… …
81our $LOGVIEW; 84our $LOGVIEW;
82our $CONSOLE; 85our $CONSOLE;
83our $METASERVER; 86our $METASERVER;
84our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 88our $QUIT_DIALOG;
89our $HOST_ENTRY;
90our $SERVER_INFO;
86 91
92our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK;
94our $SETUP_SERVER;
95our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
87our $FLOORBOX; 100our $FLOORBOX;
88our $GAUGES; 101our $GAUGES;
89our $STATWIDS; 102our $STATWIDS;
90 103
91our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
99our $STATUSBOX; 112our $STATUSBOX;
100our $DEBUG_STATUS; 113our $DEBUG_STATUS;
101 114
102our $INV; 115our $INV;
103our $INVR; 116our $INVR;
104our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
122our $BIND_EDITOR;
123our $BIND_UPD_CB;
124
125our $PICKUP_CFG;
105 126
106sub status { 127sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 129}
109 130
110sub debug { 131sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 132 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 133}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 134
135sub destroy_query_dialog {
136 (delete $_[0]{query_dialog})->destroy
137 if $_[0]{query_dialog};
138}
139
140# server query dialog
141sub server_query {
142 my ($conn, $flags, $prompt) = @_;
143
144 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
145 x => "center",
146 y => "center",
147 title => "Server Query",
148 child => my $vbox = new CFClient::UI::VBox,
149 ;
150
151 my @dialog = my $label = new CFClient::UI::Label
152 max_w => $::WIDTH * 0.4,
153 ellipsise => 0,
154 text => $prompt;
155
156 if ($flags & CS_QUERY_YESNO) {
157 push @dialog, my $hbox = new CFClient::UI::HBox;
158
159 $hbox->add (new CFClient::UI::Button
160 text => "No",
161 on_activate => sub {
162 $conn->send ("reply n");
163 $dialog->destroy;
164 0
165 }
166 );
167 $hbox->add (new CFClient::UI::Button
168 text => "Yes",
169 on_activate => sub {
170 $conn->send ("reply y");
171 destroy_query_dialog $conn;
172 0
173 },
174 );
175
176 $dialog->grab_focus;
177
178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
179 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
180
181 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
182 $MESSAGE_WINDOW->show;
183
184 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4,
186 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n";
188
189 unshift @dialog, my $table = new CFClient::UI::Table;
190
191 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race",
193 on_activate => sub {
194 $conn->send ("reply n");
195 destroy_query_dialog $conn;
196 0
197 },
198 );
199 $table->add (2, 0, new CFClient::UI::Button
200 text => "Accept",
201 on_activate => sub {
202 $conn->send ("reply d");
203 destroy_query_dialog $conn;
204 0
205 },
206 );
207
208 unshift @dialog, new CFClient::UI::Label
209 max_w => $::WIDTH * 0.4,
210 ellipsise => 0,
211 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "Look at the <b>Messages</b> window to see a description of this race "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "and the center of the screen to see how this race looks like "
216 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
217 . "You can look at another race, or accept this race (you will come back to this race eventually, "
218 . "so you can take your time making this important choice."
219 ;
220
221 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat");
224 destroy_query_dialog $conn;
225 return;
226 }
227
228 $STATS_WINDOW->show;
229 $MESSAGE_WINDOW->hide;
230
231 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4,
233 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n";
235
236 unshift @dialog, my $table = new CFClient::UI::Table;
237
238 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button
240 text => "Roll Again",
241 on_activate => sub {
242 $conn->send ("reply y");
243 destroy_query_dialog $conn;
244 0
245 },
246 );
247
248 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
250 value => $_,
251 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
255 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
256 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
257 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
258 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
259 ],
260 ), 1 .. 2;
261
262 $table->add (2, 0, new CFClient::UI::Button
263 text => "Swap Stats",
264 on_activate => sub {
265 $conn->{stat_change_with} = $sw2->{value};
266 $conn->send ("reply $sw1->{value}");
267 destroy_query_dialog $conn;
268 0
269 },
270 );
271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
272
273 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept",
276 on_activate => sub {
277 $conn->send ("reply n");
278 $STATS_WINDOW->hide;
279 destroy_query_dialog $conn;
280 0
281 },
282 );
283
284 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4,
286 ellipsise => 0,
287 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "Look at the <b>Stats</b> window to see your basic stats "
290 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
291 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
292 . "Race selection will influence those values later on."
293 ;
294 }
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub {
298 $conn->send ("reply $_[1]");
299 destroy_query_dialog $conn;
300 0
301 },
302 ;
303
304 $entry->grab_focus;
305
306 } else {
307 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
308
309 push @dialog, my $entry = new CFClient::UI::Entry
310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
311 on_activate => sub {
312 $conn->send ("reply $_[1]");
313 destroy_query_dialog $conn;
314 0
315 },
316 ;
317
318 $entry->grab_focus;
319 }
320
321 $vbox->add (@dialog);
322 $dialog->show;
114} 323}
115 324
116sub start_game { 325sub start_game {
117 status "logging in..."; 326 status "logging in...";
118 327
328 $LOGIN_BUTTON->set_text ("Logout");
329 $SETUP_DIALOG->hide;
330
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 332
121 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
122 334
123 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
124 336
125 $CONN = eval { 337 $CONN = eval {
126 new CFClient::Protocol 338 new CFClient::Protocol
127 host => $host, 339 host => $host,
128 port => $port || 13327, 340 port => $port || 13327,
129 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
130 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
131 mapw => $mapsize, 343 mapw => $mapsize,
132 maph => $mapsize, 344 maph => $mapsize,
133 345
134 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 347 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 348 statusbox => $STATUSBOX,
137 map => $MAP, 349 map => $MAP,
138 mapmap => $MAPMAP, 350 mapmap => $MAPMAP,
351 query => \&server_query,
139 352
140 sound_play => sub { 353 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 354 my ($x, $y, $soundnum, $type) = @_;
142 355
143 $SDL_MIXER 356 $SDL_MIXER
… …
151 }; 364 };
152 365
153 if ($CONN) { 366 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 367 CFClient::lowdelay fileno $CONN->{fh};
155 368
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 369 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 370 } else {
163 status "unable to connect"; 371 status "unable to connect";
164 stop_game(); 372 stop_game();
165 } 373 }
166} 374}
167 375
168sub stop_game { 376sub stop_game {
377 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show;
380 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells;
382
169 return unless $CONN; 383 return unless $CONN;
170 384
171 status "connection closed"; 385 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 386
387 destroy_query_dialog $CONN;
173 $CONN->destroy; 388 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
175 390
176 $BUTTONBAR->{children}[1]->emit ("activate") 391 undef $MAP;
177 unless $BUTTONBAR->{children}[1]->{state};
178} 392}
179 393
180sub client_setup { 394sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 395 my $vbox = new CFClient::UI::VBox;
396
184 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 397 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
185 398
186 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 399 $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); 400 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
188 401
189 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 402 $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"); 403 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
191 404
192 $mode_slider->connect (changed => sub { 405 $mode_slider->connect (changed => sub {
193 my ($self, $value) = @_; 406 my ($self, $value) = @_;
194 407
… …
201 414
202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
207 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value;
209 }
210 ); 420 );
211 421
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 424 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fast} = $value;
219 }
220 ); 427 );
221 428
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
223 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value;
229 }
230 ); 434 );
231 435
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 436 $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 437 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
235 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 439 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
236 connect_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value;
239 }
240 ); 441 );
241 442
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
243 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 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.", 446 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 { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value;
249 }
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::GL_VERSION < 1.2; 457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
458 0
260 } 459 }
261 ); 460 );
262 461
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 462 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
264 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 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.", 465 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] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
268 ); 467 );
269 468
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 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.", 472 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]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
275 ); 474 );
276 475
277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
278 477
279 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 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.", 480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
282 connect_changed => sub { 481 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
285 } 485 }
286 ); 486 );
287 487
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
289 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 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.", 491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
292 connect_changed => sub { 492 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
295 } 496 }
296 ); 497 );
297 498
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
299 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 502 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
302 connect_changed => sub { 503 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
305 } 507 }
306 ); 508 );
307 509
308 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
311 connect_activate => sub { 513 on_activate => sub {
312 video_shutdown (); 514 video_shutdown ();
313 video_init (); 515 video_init ();
516 0
314 } 517 }
315 ); 518 );
519
520 $vbox
521}
522
523sub audio_setup {
524 my $vbox = new CFClient::UI::VBox;
525
526 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
527
528 my $row = 0;
316 529
317 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 530 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 532 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.", 533 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 { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
322 $CFG->{audio_enable} = $_[1];
323 }
324 ); 535 );
325# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 536# $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 { 537# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
327# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
328# }); 539# });
329 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 540 $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); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
333 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 544 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
334 connect_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
335 $CFG->{bgm_enable} = $_[1];
336 }
337 ); 546 );
338 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
342 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128;
344 }
345 ); 551 );
346 552
347 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
350 connect_activate => sub { 556 on_activate => sub {
351 audio_shutdown (); 557 audio_shutdown ();
352 audio_init (); 558 audio_init ();
559 0
353 } 560 }
354 ); 561 );
355 562
356 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $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} 564}
370 565
371sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
372 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
373 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
382 577
383sub make_gauge_window { 578sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 579 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 580
386 my $win = new CFClient::UI::Frame ( 581 my $win = new CFClient::UI::Frame (
387 req_y => -1, 582 force_x => 0,
583 force_y => "max",
388 user_w => $WIDTH, 584 force_w => $WIDTH,
389 user_h => $gh, 585 force_h => $gh,
390 ); 586 );
391 587
392 $win->add (my $hbox = new CFClient::UI::HBox 588 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 589 children => [
394 (new CFClient::UI::HBox expand => 1), 590 (new CFClient::UI::HBox expand => 1),
… …
430 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
431 627
432 $win 628 $win
433} 629}
434 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
435sub make_stats_window { 659sub stats_window {
436 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 660 my $tgw =
661 new CFClient::UI::Window
662 child => my $vb = new CFClient::UI::VBox;
437 663
438 $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, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
440 can_hover => 1, can_events => 1, 665 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."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
442 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
443 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
444 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).");
445 670
446 $vb->add (my $hb0 = new CFClient::UI::HBox); 671 $vb->add (my $hb0 = new CFClient::UI::HBox);
447 $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,
448 can_hover => 1, can_events => 1, 673 can_hover => 1, can_events => 1,
449 tooltip => "This is the amount the Player weights."); 674 tooltip => "The weight of the player including all inventory items.");
450 $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,
451 can_hover => 1, can_events => 1, 676 can_hover => 1, can_events => 1,
452 tooltip => "The weight limit, you can't carry more than this."); 677 tooltip => "The weight limit: you cannot carry more than this.");
453 678
454 679
455 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 680 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
456 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 681 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
457 682
… …
467 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
468 693
469 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 694 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
470 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 695 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
471 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 696 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
472 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 697 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
473 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 698 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
474 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 699 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
475 ) { 700 ) {
476 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
477 702
… …
496 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
497 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
498 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
499 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
500 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
501 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
502 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
503 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 728 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
504 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
505 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
506 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
523 ); 748 );
524 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
525 font => $FONT_FIXED, 750 font => $FONT_FIXED,
526 can_hover => 1, 751 can_hover => 1,
527 can_events => 1, 752 can_events => 1,
528 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
529 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
530 ); 755 );
531 756
532 $row++; 757 $row++;
533 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
540 update_stats_window ({}); 765 update_stats_window ({});
541 766
542 $tgw 767 $tgw
543} 768}
544 769
545sub formsep { 770sub formsep($) {
546 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
547} 772}
548 773
549sub update_stats_window { 774sub update_stats_window {
550 my ($stats) = @_; 775 my ($stats) = @_;
551 776
… …
581 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
587 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588 $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});
589 814
590 $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);
591 816
592 # TODO: replace by CS_STAT_RES_xxx constants
593 my %tbl = ( 817 my %tbl = (
594 phys => 100, 818 phys => CS_STAT_RES_PHYS,
595 magic => 101, 819 magic => CS_STAT_RES_MAG,
596 fire => 102, 820 fire => CS_STAT_RES_FIRE,
597 elec => 103, 821 elec => CS_STAT_RES_ELEC,
598 cold => 104, 822 cold => CS_STAT_RES_COLD,
599 conf => 105, 823 conf => CS_STAT_RES_CONF,
600 acid => 106, 824 acid => CS_STAT_RES_ACID,
601 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
602 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
603 pois => 109, 827 pois => CS_STAT_RES_POISON,
604 slow => 110, 828 slow => CS_STAT_RES_SLOW,
605 para => 111, 829 para => CS_STAT_RES_PARA,
606 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
607 fear => 113, 831 fear => CS_STAT_RES_FEAR,
608 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
609 deat => 115, 833 deat => CS_STAT_RES_DEATH,
610 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
611 blind => 117, 835 blind => CS_STAT_RES_BLIND,
612 ); 836 );
613 837
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615 for keys %tbl; 839 for keys %tbl;
616} 840}
617 841
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; 842my $METASERVER_ATIME;
629 843
630sub update_metaserver { 844sub update_metaserver {
631 my ($HOST) = @_; 845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
632 849
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};
… …
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->{profile}{default}{host} = $host);
925 $METASERVER->hide;
926 0
927 },
695 }), 928 ),
696 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
697 ]); 930 ]);
698 931
699 $table->add ($_ + 1, $y, new CFClient::UI::Label 932 $table->add ($_, $y, new CFClient::UI::Label
700 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 933 ellipsise => 0,
934 align => $align[$_],
935 text => $m->[$_],
936 tooltip => $tip[$_],
937 can_hover => 1,
938 can_events => 1,
939 fontsize => 0.8)
701 for 0 .. $#$m; 940 for 0 .. $#$m;
702 } 941 }
703 } 942 }
704 }); 943 });
705} 944}
706 945
946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
951 my $dialog = new CFClient::UI::FancyFrame
952 title => "Server List",
953 name => 'metaserver_dialog',
954 x => 'center',
955 y => 'center',
956 z => 3,
957 force_h => $::HEIGHT * 0.4,
958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
961 on_visibility_change => sub {
962 update_metaserver ($_[0]) if $_[1];
963 0
964 },
965 ;
966
967 $dialog
968}
969
707sub server_setup { 970sub server_setup {
708 my $dialog = new CFClient::UI::FancyFrame
709 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 971 my $vbox = new CFClient::UI::VBox;
711 972
712 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 973 $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"); 974 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
714 975
715 { 976 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
717 978
718 $vbox->add ( 979 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
720 expand => 1, 981 expand => 1,
721 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
722 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
723 connect_changed => sub { 984 on_changed => sub {
724 my ($self, $value) = @_; 985 my ($self, $value) = @_;
725 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
726 } 988 }
727 ); 989 );
728 990
729 $METASERVER = metaserver_dialog;
730
731 $vbox->add (new CFClient::UI::Flopper 991 $vbox->add (new CFClient::UI::Button
732 expand => 1, 992 expand => 1,
733 text => "Server List", 993 text => "Server List",
734 other => $METASERVER, 994 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
737 update_metaserver $HOST; 997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
738 }
739 ); 998 );
740 } 999 }
741 1000
742 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
743 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
745 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
746 connect_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
747 my ($self, $value) = @_;
748 $CFG->{user} = $value;
749 }
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->{profile}{default}{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 { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
758 my ($self, $value) = @_;
759 $CFG->{password} = $value;
760 }
761 ); 1014 );
762 1015
763 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
764 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
765 req_w => 100, 1018 force_w => 100,
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 tooltip => "This is the size of the portion of the map update the server sends you. " 1020 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, " 1021 . "If you set this to a high value you will be able to see further, "
769 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
771 connect_changed => sub { 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
772 my ($self, $value) = @_;
773
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 },
776 ); 1025 );
777 1026
778 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1027 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
779 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
780 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
… …
783 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
789 ); 1038 );
790 1039
791 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1040 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
792 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 1042 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.", 1043 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] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
796 ); 1045 );
797 1046
798 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1047 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
799 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 1049 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.", 1050 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] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
803 ); 1052 );
804 1053
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 1055 expand => 1,
807 align => 0, 1056 align => 0,
808 text => "Login", 1057 text => "Login",
809 connect_activate => sub { 1058 on_activate => sub {
810 $CONN ? stop_game 1059 $CONN ? stop_game
811 : start_game; 1060 : start_game;
1061 0
812 }, 1062 },
813 ); 1063 );
814 1064
815 $dialog 1065 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1067 text => $CFG->{say_command},
1068 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. "
1069 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1070 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1071 on_changed => sub {
1072 my ($self, $value) = @_;
1073 $CFG->{say_command} = $value;
1074 0
1075 }
1076 );
1077
1078 $vbox->add (new CFClient::UI::Label
1079 text => "Server Info",
1080 fontsize => 1.2,
1081 padding_y => 8,
1082 fg => [1, 1, 0, 1],
1083 );
1084
1085 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1086
1087 $vbox
816} 1088}
817 1089
818sub message_window { 1090sub message_window {
819 my $window = new CFClient::UI::FancyFrame 1091 my $window = new CFClient::UI::FancyFrame
1092 name => "message_window",
820 title => "Messages", 1093 title => "Messages",
821 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
823 user_w => int $::WIDTH / 3, 1096 x => "max",
1097 y => 0,
1098 force_w => $::WIDTH * 0.4,
824 user_h => int $::HEIGHT / 5, 1099 force_h => $::HEIGHT * 0.5,
825 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
826 1102
827 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
828 1104
829 $vbox->add (my $input = new CFClient::UI::Entry 1105 $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> " 1106 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>...). " 1107 . "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). " 1108 . "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.", 1109 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
834 connect_focus_in => sub { 1110 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 1111 my ($input, $prev_focus) = @_;
836 1112
837 delete $input->{refocus_map}; 1113 delete $input->{refocus_map};
838 1114
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
841 } 1117 }
842 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
843 }, 1121 },
844 connect_activate => sub { 1122 on_activate => sub {
845 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
846 $input->set_text (''); 1124 $input->set_text ('');
847 1125
848 if ($text =~ /^\/(.*)/) { 1126 if ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 1127 $::CONN->user_send ($1);
… …
853 } 1131 }
854 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
857 } 1135 }
1136
1137 0
858 }, 1138 },
859 connect_escape => sub { 1139 on_escape => sub {
860 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
861 }, 1143 },
862 ); 1144 );
863 1145
864 $CONSOLE = { 1146 $CONSOLE = {
865 window => $window, 1147 window => $window,
866 input => $input 1148 input => $input,
867 }; 1149 };
868 1150
869 $window 1151 $window
870} 1152}
871 1153
872sub open_quit_dialog { 1154sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 1155 unless ($QUIT_DIALOG) {
874
875 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1156 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1157 x => "center",
1158 y => "center",
1159 z => 50,
1160 title => "Really Quit?",
1161 ;
876 1162
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1163 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 1164
879 $vb->add (new CFClient::UI::Label 1165 $vb->add (new CFClient::UI::Label
880 text => "You should find a savebed and apply it first!", 1166 text => "You should find a savebed and apply it first!",
… …
883 ); 1169 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
886 text => "Ok", 1172 text => "Ok",
887 expand => 1, 1173 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
889 ); 1175 );
890 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 1177 text => "Quit anyway",
892 expand => 1, 1178 expand => 1,
893 connect_activate => sub { exit }, 1179 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 ); 1180 );
962 } 1181 }
963 1182
964 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1183 $QUIT_DIALOG->show;
1184}
1185
1186sub autopickup_setup {
1187 my $table = new CFClient::UI::Table;
1188
1189 for (
1190 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG],
1195 ],
1196 ["Weapons", 0, 6,
1197 ["All weapons" => PICKUP_ALLWEAPON],
1198 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1199 ["Bows" => PICKUP_BOW],
1200 ["Arrows" => PICKUP_ARROW],
1201 ],
1202 ["Armour", 0, 12,
1203 ["Helmets" => PICKUP_HELMET],
1204 ["Shields" => PICKUP_SHIELD],
1205 ["Body Armour" => PICKUP_ARMOUR],
1206 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK],
1209 ],
1210
1211 ["Readables", 2, 2,
1212 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ],
1216 ["Misc", 2, 7,
1217 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS],
1226 ],
1227 ["Weight/Value ratio", 2, 17]
1228 )
1229 {
1230 my ($title, $x, $y, @bits) = @$_;
1231 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232
1233 for (@bits) {
1234 ++$y;
1235
1236 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub {
1241 my ($box, $value) = @_;
1242
1243 if ($value) {
1244 $::CFG->{pickup} |= $mask;
1245 } else {
1246 $::CFG->{pickup} &= ~$mask;
1247 }
1248
1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN;
1251
1252 0
1253 });
1254 }
1255 }
1256
1257 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1278 $table
1279}
1280
1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1302 x => "center",
1303 y => "center",
1304 force_w => $WIDTH * 9/10,
1305 force_h => $HEIGHT * 9/10,
1306 title => "Player",
1307 has_close_button => 1
1308 ;
1309
1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
1322
1323 $ntb->add (
1324 Stats => $STATS_WINDOW = stats_window,
1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1331
1332 $plwin->add ($ntb);
1333 $plwin
1334}
1335
1336sub update_bindings {
1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1338}
1339
1340sub keyboard_setup {
1341 my $binding_list = new CFClient::UI::VBox;
1342
1343 my $refresh;
1344 $refresh = $BIND_UPD_CB = sub {
1345 $binding_list->clear ();
1346
1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1351
1352 my $lbl = join "; ", @$cmds;
1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1355 $hb->add (new CFClient::UI::Button
1356 text => "delete",
1357 tooltip => "Deletes the binding",
1358 on_activate => sub {
1359 $binding_list->remove ($hb);
1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
1362 });
1363
1364 $hb->add (new CFClient::UI::Button
1365 text => "edit",
1366 tooltip => "Edits the binding",
1367 on_activate => sub {
1368 $::BIND_EDITOR->set_binding (
1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1370 sub {
1371 my ($nmod, $nsym, $ncmds) = @_;
1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1374 $refresh->();
1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1377 },
1378 sub {
1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1380 $SETUP_DIALOG->show;
1381 });
1382 $::BIND_EDITOR->show;
1383 $SETUP_DIALOG->hide;
1384 0
1385 });
1386
1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1389 }
1390 }
1391 };
1392
1393 my $vb = new CFClient::UI::VBox;
1394 $vb->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1396 $hb->add (new CFClient::UI::CheckBox
1397 expand => 1,
1398 state => $CFG->{shift_fire_stop},
1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1400 on_changed => sub {
1401 my ($cbox, $value) = @_;
1402 $CFG->{shift_fire_stop} = $value;
1403 0
1404 });
1405
1406 $vb->add ($binding_list);
1407 $vb->add (my $hb = new CFClient::UI::HBox);
1408
1409 $hb->add (new CFClient::UI::Button
1410 text => "record new",
1411 expand => 1,
1412 tooltip => "This button opens the binding editor with an empty binding.",
1413 on_activate => sub {
1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1415 sub {
1416 my ($mod, $sym, $cmds) = @_;
1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1418 $refresh->();
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 },
1422 sub {
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 },
1426 );
1427 $SETUP_DIALOG->hide;
1428 $::BIND_EDITOR->show;
1429 0
1430 },
1431 );
1432
1433 $hb->add (new CFClient::UI::Button
1434 text => "close",
1435 tooltip => "Closes the binding window",
1436 expand => 1,
1437 on_activate => sub {
1438 $SETUP_DIALOG->hide;
1439 0
1440 }
1441 );
1442
1443 $refresh->();
1444
1445 $vb
1446}
1447
1448sub help_window {
1449 my $win = new CFClient::UI::FancyFrame
1450 x => 'center',
1451 y => 'center',
1452 z => 2,
1453 name => 'doc_browser',
1454 force_w => int $WIDTH * 7/8,
1455 force_h => int $HEIGHT * 7/8,
1456 title => "Documentation";
1457
1458 $win->add (my $vbox = new CFClient::UI::VBox);
1459
1460 $vbox->add (my $buttons = new CFClient::UI::HBox);
1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1462 expand => 1, fontsize => 0.8, padding_x => 4);
1463
1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1466 value => undef,
1467 options => [
1468 [intro => "Introduction"],
1469 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"],
1472 [dmcommand_help => "DM Commands"],
1473 [COPYING => "License Terms"],
1474 ],
1475 on_changed => sub {
1476 my ($self, $pod) = @_;
1477
1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1480
1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1487
1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1489 for @$pom;
1490
1491 $viewer->set_offset (0);
1492
1493 0
1494 },
1495 on_visibility_change => sub {
1496 my ($self, $visible) = @_;
1497 return unless $visible;
1498 return if $self->{value};
1499 $self->set_value ("intro");
1500 0
1501 },
1502 );
965 1503
966 $win 1504 $win
967} 1505}
968 1506
969sub sdl_init { 1507sub sdl_init {
… …
999 if ($DEBUG_STATUS) { 1537 if ($DEBUG_STATUS) {
1000 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1538 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1001 } else { 1539 } else {
1002 # create the widgets 1540 # create the widgets
1003 1541
1004 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1542 $DEBUG_STATUS = new CFClient::UI::Label
1543 padding => 0,
1544 z => 100,
1545 force_x => "max",
1546 force_y => 0;
1005 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1006 1548
1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1550
1007 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $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]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1009 1553
1010 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
1011 bg => [0, 0, 0, 0.4], 1555 bg => [0, 0, 0, 0.4],
1012 req_y => -1, 1556 force_x => 0,
1557 force_y => "max",
1013 child => $STATUSBOX, 1558 child => $STATUSBOX,
1014 )->show; 1559 )->show;
1015 1560
1016 CFClient::UI::FancyFrame->new ( 1561 CFClient::UI::FancyFrame->new (
1562 title => "Map",
1563 name => "mapmap",
1564 x => 0,
1565 y => $FONTSIZE + 8,
1017 border_bg => [1, 1, 1, 192/255], 1566 border_bg => [1, 1, 1, 192/255],
1018 bg => [1, 1, 1, 0], 1567 bg => [1, 1, 1, 0],
1019 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1568 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.", 1569 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1021 ), 1570 ),
… …
1025 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1026 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1027 1576
1028 if ($CONSOLE) { 1577 if ($CONSOLE) {
1029 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1030 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1031 1580
1032 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1033 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1034 } 1583 }
1035 } 1584 }
1036 }); 1585 });
1037 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1038 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1039 1588
1040 $LOGVIEW = new CFClient::UI::TextView 1589 $LOGVIEW = new CFClient::UI::TextScroller
1041 expand => 1, 1590 expand => 1,
1042 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1043 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
1593 indent => -4,
1044 can_hover => 1, 1594 can_hover => 1,
1045 can_events => 1, 1595 can_events => 1,
1046 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1596 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1047 ; 1597 ;
1048 1598
1049 $BUTTONBAR = new CFClient::UI::HBox; 1599 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1600 title => "Setup",
1601 name => "setup_dialog",
1602 x => 'center',
1603 y => 'center',
1604 z => 2,
1605 force_w => $::WIDTH * 0.6,
1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1608 ;
1050 1609
1610 $METASERVER = metaserver_dialog;
1611
1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1614
1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1616 "Configure the server to play on, your username, password and other server-related options.");
1617 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1618 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1622 "Configure the use of audio, sound effects and background music.");
1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1624 "Lets you define, edit and delete key bindings."
1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1626 . "with nothing set and the recording started. After doing the actions you "
1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1628 . "After pressing the combo the binding will be saved automatically and the "
1629 . "binding editor closes");
1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1631 "Some debuggin' options. Do not ask.");
1632
1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1634
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1635 $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."); 1636 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, 1637
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, 1638 $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."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1057 1640
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 1641 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 1642
1060 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1061 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, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1063 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1064 1645
1065 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1647 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.", 1648 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 { 1649 on_activate => sub {
1650 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1070 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1071 }, 1654 },
1072 ); 1655 );
1073 1656
1074 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1075 tooltip => "View Documentation"); 1658 tooltip => "View Documentation");
1076 1659
1077 $BUTTONBAR->add (new CFClient::UI::Button 1660 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1661 text => "Quit",
1079 tooltip => "Terminates the program", 1662 tooltip => "Terminates the program",
1080 connect_activate => sub { 1663 on_activate => sub {
1081 if ($CONN) { 1664 if ($CONN) {
1082 open_quit_dialog; 1665 open_quit_dialog;
1083 } else { 1666 } else {
1084 exit; 1667 exit;
1085 } 1668 }
1669 0
1086 }, 1670 },
1087 ); 1671 );
1088 1672
1089 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1090 1674 $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 } 1675 }
1676
1677 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1101} 1678}
1102 1679
1103sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1104 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1105} 1684}
1106 1685
1107my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1686my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1108my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
… …
1172 1751
1173my %demo;#d# 1752my %demo;#d#
1174 1753
1175sub force_refresh { 1754sub force_refresh {
1176 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1755 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1177 debug sprintf "%3.2f", $fps; 1756 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1178 1757
1179 $CFClient::UI::ROOT->draw; 1758 $CFClient::UI::ROOT->draw;
1180 1759
1181 $WANT_REFRESH = 0; 1760 $WANT_REFRESH = 0;
1182 $CAN_REFRESH = 0; 1761 $CAN_REFRESH = 0;
… …
1237}; 1816};
1238 1817
1239 CFClient::SDL_GL_SwapBuffers; 1818 CFClient::SDL_GL_SwapBuffers;
1240} 1819}
1241 1820
1242my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1243 $NOW = time; 1822 $NOW = time;
1244 1823
1245 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1246 for CFClient::SDL_PollEvent; 1825 for CFClient::SDL_PollEvent;
1247 1826
… …
1314############################################################################# 1893#############################################################################
1315 1894
1316$SIG{INT} = $SIG{TERM} = sub { exit }; 1895$SIG{INT} = $SIG{TERM} = sub { exit };
1317 1896
1318{ 1897{
1319 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1898 local $SIG{__DIE__} = sub {
1899 return unless defined $^S && !$^S;
1900 Carp::confess $_[1];#d#TODO: remove when stable
1901 CFClient::fatal $_[0];
1902 };
1320 1903
1321 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1905 CFClient::UI::set_layout ($::CFG->{layout});
1322 1906
1323 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1324 sdl_mode => 0, 1908 sdl_mode => 0,
1325 width => 640, 1909 width => 640,
1326 height => 480, 1910 height => 480,
1327 fullscreen => 0, 1911 fullscreen => 0,
1328 fast => 0, 1912 fast => 0,
1329 map_scale => 1, 1913 map_scale => 1,
1330 fow_enable => 1, 1914 fow_enable => 1,
1331 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1332 fow_smooth => 0, 1916 fow_smooth => 0,
1333 gui_fontsize => 1, 1917 gui_fontsize => 1,
1334 log_fontsize => 1, 1918 log_fontsize => 0.7,
1335 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1336 gauge_size => 0.35, 1920 gauge_size => 0.35,
1337 stat_fontsize => 1, 1921 stat_fontsize => 0.7,
1338 mapsize => 100, 1922 mapsize => 100,
1339 host => "crossfire.schmorp.de",
1340 say_command => 'say', 1923 say_command => 'say',
1341 audio_enable => 1, 1924 audio_enable => 1,
1342 bgm_enable => 1, 1925 bgm_enable => 1,
1343 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1344 face_prefetch => 0, 1927 face_prefetch => 0,
1345 output_sync => 1, 1928 output_sync => 1,
1346 output_count => 1, 1929 output_count => 1,
1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1347 ); 1933
1348
1349 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1350 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1351 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1352 1939
1353 sdl_init; 1940 sdl_init;
1354 1941
1355 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1356 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1398 video_init; 1985 video_init;
1399 audio_init; 1986 audio_init;
1400} 1987}
1401 1988
1402Event::loop; 1989Event::loop;
1990#CFClient::SDL_Quit;
1991#CFClient::_exit 0;
1403 1992
1404END { CFClient::SDL_Quit } 1993END { CFClient::SDL_Quit }
1405 1994
1406=head1 NAME 1995=head1 NAME
1407 1996
1408pclient - A Crossfire+ and Crossfire game client 1997cfplus - A Crossfire+ and Crossfire game client
1409 1998
1410=head1 SYNOPSIS 1999=head1 SYNOPSIS
1411 2000
1412Just run it - no commandline arguments are supported. 2001Just run it - no commandline arguments are supported.
1413 2002
1414=head1 USAGE 2003=head1 USAGE
1415 2004
1416Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2005cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1417fullscreen and interactively. 2006fullscreen and interactively.
1418 2007
2008=head1 DEBUGGING
2009
2010
2011CFPLUS_DEBUG - environment variable
2012
2013 1 draw borders around widgets
2014 2 add low-level widget info to tooltips
2015 4 show fps
2016 8 suppress tooltips
2017
1419=head1 AUTHOR 2018=head1 AUTHOR
1420 2019
1421Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2020Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1422 2021
1423 2022

Diff Legend

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