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.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.111 by root, Sun Aug 13 19:47:05 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
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFPlus;
39use CFClient::OpenGL (); 38use CFPlus::OpenGL ();
40use CFClient::Protocol; 39use CFPlus::Protocol;
41use CFClient::UI; 40use CFPlus::UI;
41use CFPlus::Pod;
42use CFPlus::BindingEditor;
42use CFClient::MapWidget; 43use CFPlus::MapWidget;
43 44
45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
47
48$Event::Eval = 0;
44$Event::DIED = sub { 49$Event::DIED = sub {
45 # TODO: display dialog box or so 50 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 52 CFPlus::error $_[1];
47}; 53};
48 54
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
50 63
51our $VERSION = '0.1'; 64our $VERSION = '0.1';
52 65
53my $MAX_FPS = 60; 66my $MAX_FPS = 60;
54my $MIN_FPS = 5; # unused as of yet 67my $MIN_FPS = 5; # unused as of yet
… …
81our $LOGVIEW; 94our $LOGVIEW;
82our $CONSOLE; 95our $CONSOLE;
83our $METASERVER; 96our $METASERVER;
84our $LOGIN_BUTTON; 97our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 98our $QUIT_DIALOG;
99our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE;
101our $PICKUP_ENABLE;
102our $SERVER_INFO;
86 103
104our $SETUP_DIALOG;
105our $SETUP_NOTEBOOK;
106our $SETUP_SERVER;
107our $SETUP_KEYBOARD;
108
109our $PL_NOTEBOOK;
110our $PL_WINDOW;
111
112our $INVENTORY_PAGE;
113our $STATS_PAGE;
114our $SKILL_PAGE;
115our $SPELL_PAGE;
116
117our $HELP_WINDOW;
118our $MESSAGE_WINDOW;
87our $FLOORBOX; 119our $FLOORBOX;
88our $GAUGES; 120our $GAUGES;
89our $STATWIDS; 121our $STATWIDS;
90 122
91our $SDL_ACTIVE; 123our $SDL_ACTIVE;
… …
99our $STATUSBOX; 131our $STATUSBOX;
100our $DEBUG_STATUS; 132our $DEBUG_STATUS;
101 133
102our $INV; 134our $INV;
103our $INVR; 135our $INVR;
104our $INVR_LBL; 136our $INV_RIGHT_HB;
137
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG;
105 142
106sub status { 143sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 145}
109 146
110sub debug { 147sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 149}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 150
151sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog};
154}
155
156# server query dialog
157sub server_query {
158 my ($conn, $flags, $prompt) = @_;
159
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
161 x => "center",
162 y => "center",
163 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox,
165 ;
166
167 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4,
169 ellipsise => 0,
170 text => $prompt;
171
172 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox;
174
175 $hbox->add (new CFPlus::UI::Button
176 text => "No",
177 on_activate => sub {
178 $conn->send ("reply n");
179 $dialog->destroy;
180 0
181 }
182 );
183 $hbox->add (new CFPlus::UI::Button
184 text => "Yes",
185 on_activate => sub {
186 $conn->send ("reply y");
187 destroy_query_dialog $conn;
188 0
189 },
190 );
191
192 $dialog->grab_focus;
193
194 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show;
199
200 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n";
204
205 unshift @dialog, my $table = new CFPlus::UI::Table;
206
207 $table->add (0, 0, new CFPlus::UI::Button
208 text => "Next Race",
209 on_activate => sub {
210 $conn->send ("reply n");
211 destroy_query_dialog $conn;
212 0
213 },
214 );
215 $table->add (2, 0, new CFPlus::UI::Button
216 text => "Accept",
217 on_activate => sub {
218 $conn->send ("reply d");
219 destroy_query_dialog $conn;
220 0
221 },
222 );
223
224 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4,
226 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ;
229
230 } elsif ($prompt =~ /roll new stats/) {
231 if (my $stat = delete $conn->{stat_change_with}) {
232 $conn->send ("reply $stat");
233 destroy_query_dialog $conn;
234 return;
235 }
236
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4,
242 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n";
244
245 unshift @dialog, my $table = new CFPlus::UI::Table;
246
247 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button
249 text => "Roll Again",
250 on_activate => sub {
251 $conn->send ("reply y");
252 destroy_query_dialog $conn;
253 0
254 },
255 );
256
257 # center: swap stats
258 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
259 expand => 1,
260 value => $_,
261 options => [
262 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
263 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
264 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
265 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
266 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ],
270 ), 1 .. 2;
271
272 $table->add (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats",
274 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn;
278 0
279 },
280 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282
283 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button
285 text => "Accept",
286 on_activate => sub {
287 $conn->send ("reply n");
288 $STATS_PAGE->hide;
289 destroy_query_dialog $conn;
290 0
291 },
292 );
293
294 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
295 for (
296 [Str => CS_STAT_STR],
297 [Dex => CS_STAT_DEX],
298 [Con => CS_STAT_CON],
299 [Int => CS_STAT_INT],
300 [Wis => CS_STAT_WIS],
301 [Pow => CS_STAT_POW],
302 [Cha => CS_STAT_CHA],
303 ) {
304 my ($name, $id) = @$_;
305 $hbox->add (new CFPlus::UI::Label
306 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
307 align => 0,
308 expand => 1,
309 can_events => 1,
310 can_hover => 1,
311 tooltip => "#stat_$name",
312 );
313 }
314
315 unshift @dialog, new CFPlus::UI::Label
316 max_w => $::WIDTH * 0.4,
317 ellipsise => 0,
318 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
319 ;
320 }
321
322 push @dialog, my $entry = new CFPlus::UI::Entry
323 on_changed => sub {
324 $conn->send ("reply $_[1]");
325 destroy_query_dialog $conn;
326 0
327 },
328 ;
329
330 $entry->grab_focus;
331
332 } else {
333 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
334
335 push @dialog, my $entry = new CFPlus::UI::Entry
336 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
337 on_activate => sub {
338 $conn->send ("reply $_[1]");
339 destroy_query_dialog $conn;
340 0
341 },
342 ;
343
344 $entry->grab_focus;
345 }
346
347 $vbox->add (@dialog);
348 $dialog->show;
114} 349}
115 350
116sub start_game { 351sub start_game {
117 status "logging in..."; 352 status "logging in...";
118 353
354 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide;
356
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 358
121 my ($host, $port) = split /:/, $CFG->{host}; 359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
122 360
123 $MAP = new CFClient::Map $mapsize, $mapsize; 361 $MAP = new CFPlus::Map $mapsize, $mapsize;
124 362
125 $CONN = eval { 363 $CONN = eval {
126 new CFClient::Protocol 364 new CFPlus::Protocol
127 host => $host, 365 host => $host,
128 port => $port || 13327, 366 port => $port || 13327,
129 user => $CFG->{user}, 367 user => $CFG->{profile}{default}{user},
130 pass => $CFG->{password}, 368 pass => $CFG->{profile}{default}{password},
131 mapw => $mapsize, 369 mapw => $mapsize,
132 maph => $mapsize, 370 maph => $mapsize,
133 371
134 map_widget => $MAPWIDGET, 372 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 373 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 374 statusbox => $STATUSBOX,
137 map => $MAP, 375 map => $MAP,
138 mapmap => $MAPMAP, 376 mapmap => $MAPMAP,
377 query => \&server_query,
139 378
140 sound_play => sub { 379 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 380 my ($x, $y, $soundnum, $type) = @_;
142 381
143 $SDL_MIXER 382 $SDL_MIXER
… …
149 $chunk->play; 388 $chunk->play;
150 }, 389 },
151 }; 390 };
152 391
153 if ($CONN) { 392 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 393 CFPlus::lowdelay fileno $CONN->{fh};
155 394
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 395 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 396 } else {
163 status "unable to connect"; 397 status "unable to connect";
164 stop_game(); 398 stop_game();
165 } 399 }
166} 400}
167 401
168sub stop_game { 402sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells;
408
169 return unless $CONN; 409 return unless $CONN;
170 410
171 status "connection closed"; 411 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 412
413 destroy_query_dialog $CONN;
173 $CONN->destroy; 414 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 415 $CONN = 0; # false, does not autovivify
175 416
176 $BUTTONBAR->{children}[1]->emit ("activate") 417 undef $MAP;
177 unless $BUTTONBAR->{children}[1]->{state};
178} 418}
179 419
180sub client_setup { 420sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame 421 my $vbox = new CFPlus::UI::VBox;
182 name => "client_setup", 422
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox);
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
186 424
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
189 427
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 428 $hbox->add (my $mode_slider = new CFPlus::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"); 429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 430
193 $mode_slider->connect (changed => sub { 431 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 432 my ($self, $value) = @_;
195 433
196 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
198 }); 436 });
199 $mode_slider->emit (changed => $mode_slider->{range}[0]); 437 $mode_slider->emit (changed => $mode_slider->{range}[0]);
200 438
201 my $row = 1; 439 my $row = 1;
202 440
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
205 state => $CFG->{fullscreen}, 443 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 444 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value;
210 }
211 ); 446 );
212 447
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFPlus::UI::CheckBox
215 state => $CFG->{fast}, 450 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 451 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fast} = $value;
220 }
221 ); 453 );
222 454
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 456 $table->add (1, $row++, new CFPlus::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value;
230 }
231 ); 460 );
232 461
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 463 $table->add (1, $row++, new CFPlus::UI::CheckBox
235 state => $CFG->{fow_enable}, 464 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value;
240 }
241 ); 467 );
242 468
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFPlus::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 471 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.", 472 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 { 473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value;
250 }
251 ); 474 );
252 475
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 477 $table->add (1, $row++, new CFPlus::UI::CheckBox
255 state => $CFG->{fow_smooth}, 478 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 480 on_changed => sub {
258 my ($self, $value) = @_; 481 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 482 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0
261 } 485 }
262 ); 486 );
263 487
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFPlus::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 490 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.", 491 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] }, 492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
269 ); 493 );
270 494
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFPlus::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 497 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.", 498 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]) }, 499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
276 ); 500 );
277 501
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279
280 $table->add (1, $row++, new CFClient::UI::Slider
281 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.",
283 connect_changed => sub {
284 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize;
286 }
287 );
288
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 503 $table->add (1, $row++, new CFPlus::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 504 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.", 505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 506 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 507 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 508 &set_gauge_window_fontsize;
509 0
296 } 510 }
297 ); 511 );
298 512
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 514 $table->add (1, $row++, new CFPlus::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 515 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 517 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 518 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0
306 } 521 }
307 ); 522 );
308 523
309 $table->add (1, $row++, new CFClient::UI::Button 524 $table->add (1, $row++, new CFPlus::UI::Button
310 expand => 1, align => 0, text => "Apply", 525 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 526 tooltip => "Apply the video settings",
312 connect_activate => sub { 527 on_activate => sub {
313 video_shutdown (); 528 video_shutdown ();
314 video_init (); 529 video_init ();
530 0
315 } 531 }
316 ); 532 );
317 533
534 $vbox
535}
536
537sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox;
539
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
541
542 my $row = 0;
543
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, new CFPlus::UI::CheckBox
320 state => $CFG->{audio_enable}, 546 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.", 547 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 { 548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
323 $CFG->{audio_enable} = $_[1];
324 }
325 ); 549 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 550# $table->add (0, 9, new CFPlus::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 { 551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 552# $CFG->{effects_volume} = $_[1];
329# }); 553# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 556 $hbox->add (new CFPlus::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 557 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
336 $CFG->{bgm_enable} = $_[1];
337 }
338 ); 560 );
339 $hbox->add (new CFClient::UI::Slider 561 $hbox->add (new CFPlus::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 563 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
343 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128;
345 }
346 ); 565 );
347 566
348 $table->add (1, $row++, new CFClient::UI::Button 567 $table->add (1, $row++, new CFPlus::UI::Button
349 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 569 tooltip => "Apply the audio settings",
351 connect_activate => sub { 570 on_activate => sub {
352 audio_shutdown (); 571 audio_shutdown ();
353 audio_init (); 572 audio_init ();
573 0
354 } 574 }
355 ); 575 );
356 576
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 577 $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}
371
372sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize});
375 }
376} 578}
377 579
378sub set_gauge_window_fontsize { 580sub set_gauge_window_fontsize {
379 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 581 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
380 $_->set_fontsize ($::CFG->{gauge_fontsize}); 582 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
382} 584}
383 585
384sub make_gauge_window { 586sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 587 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 588
387 my $win = new CFClient::UI::Frame ( 589 my $win = new CFPlus::UI::Frame (
388 req_y => -1, 590 force_x => 0,
591 force_y => "max",
389 user_w => $WIDTH, 592 force_w => $WIDTH,
390 user_h => $gh, 593 force_h => $gh,
391 ); 594 );
392 595
393 $win->add (my $hbox = new CFClient::UI::HBox 596 $win->add (my $hbox = new CFPlus::UI::HBox
394 children => [ 597 children => [
395 (new CFClient::UI::HBox expand => 1), 598 (new CFPlus::UI::HBox expand => 1),
396 (new CFClient::UI::VBox children => [ 599 (new CFPlus::UI::VBox children => [
397 (new CFClient::UI::Empty expand => 1), 600 (new CFPlus::UI::Empty expand => 1),
398 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 601 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
399 ]), 602 ]),
400 (my $vbox = new CFClient::UI::VBox), 603 (my $vbox = new CFPlus::UI::VBox),
401 ], 604 ],
402 ); 605 );
403 606
404 $vbox->add (new CFClient::UI::HBox 607 $vbox->add (new CFPlus::UI::HBox
405 expand => 1, 608 expand => 1,
406 children => [ 609 children => [
407 (new CFClient::UI::Empty expand => 1), 610 (new CFPlus::UI::Empty expand => 1),
408 (my $hb = new CFClient::UI::HBox), 611 (my $hb = new CFPlus::UI::HBox),
409 ], 612 ],
410 ); 613 );
411 614
412 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 615 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
413 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
414 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 616 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
415 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
416 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 617 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
417 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
418 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 618 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
419 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
420 619
421 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 620 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
422 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
423 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 621 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
424 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
425 622
426 $GAUGES = { 623 $GAUGES = {
427 exp => $exp, win => $win, range => $rng, 624 exp => $exp, win => $win, range => $rng,
428 food => $fg, mana => $mg, hp => $hg, grace => $gg 625 food => $fg, mana => $mg, hp => $hg, grace => $gg
429 }; 626 };
… …
431 &set_gauge_window_fontsize; 628 &set_gauge_window_fontsize;
432 629
433 $win 630 $win
434} 631}
435 632
633sub debug_setup {
634 my $table = new CFPlus::UI::Table;
635
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
644
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646
647 for my $x (0..2) {
648 for my $y (0 .. 2) {
649 $table->add ($x + 3, $y,
650 new CFPlus::UI::Entry
651 text => $default_smooth[$x * 3 + $y],
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 );
654 }
655 }
656
657
658 $table
659}
660
436sub make_stats_window { 661sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 662 my $r = new CFPlus::UI::ScrolledWindow (
663 expand => 1,
664 scroll_y => 1
665 );
666 $r->add (my $vb = new CFPlus::UI::VBox);
438 667
439 $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, 668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 669 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."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
443 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
444 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
445 tooltip => "The map you are currently on (if supported by the server)."); 673 tooltip => "The map you are currently on (if supported by the server).");
446 674
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 675 $vb->add (my $hb0 = new CFPlus::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
450 tooltip => "The weight of the player including all inventory items."); 678 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, 679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 680 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
454 682
455
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
458 685
459 my $color2 = [1, 1, 0]; 686 my $color2 = [1, 1, 0];
460 687
461 for ( 688 for (
462 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 689 [0, 0, st_str => "Str", 30],
463 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 690 [0, 1, st_dex => "Dex", 30],
464 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 691 [0, 2, st_con => "Con", 30],
465 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 692 [0, 3, st_int => "Int", 30],
466 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 693 [0, 4, st_wis => "Wis", 30],
467 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 694 [0, 5, st_pow => "Pow", 30],
468 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 695 [0, 6, st_cha => "Cha", 30],
469 696
470 [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."], 697 [2, 0, st_wc => "Wc", -120],
471 [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."], 698 [2, 1, st_ac => "Ac", -120],
472 [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."], 699 [2, 2, st_dam => "Dam", 120],
473 [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."], 700 [2, 3, st_arm => "Arm", 120],
474 [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."], 701 [2, 4, st_spd => "Spd", 10.54],
475 [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."], 702 [2, 5, st_wspd => "WSp", 10.54],
476 ) { 703 ) {
477 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 704 my ($col, $row, $id, $label, $template) = @$_;
478 705
479 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
480 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label");
481 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
482 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label");
483 } 712 }
484 713
485 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
486 715
487 my $row = 0; 716 my $row = 0;
488 my $col = 0; 717 my $col = 0;
489 718
490 my %resist_names = ( 719 my %resist_names = (
720 slow => ["Slow",
491 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 721 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
722 holyw => ["Holy Word",
492 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 723 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
724 conf => ["Confusion",
493 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 725 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
726 fire => ["Fire",
494 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 727 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
728 depl => ["Depletion",
495 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 729 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
730 magic => ["Magic",
496 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 731 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
732 drain => ["Draining",
497 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 733 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
734 acid => ["Acid",
498 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 735 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
736 pois => ["Poison",
499 pois => "<b>Poison</b> (resistance to getting poisoned)", 737 "<b>Poison</b> (resistance to getting poisoned)"],
738 para => ["Paralysation",
500 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 739 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
740 deat => ["Death",
501 deat => "<b>Death</b> (resistance against death spells)", 741 "<b>Death</b> (resistance against death spells)"],
502 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 742 phys => ["Physical",
743 "<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.)"],
744 blind => ["Blind",
503 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 745 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
746 fear => ["Fear",
504 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)", 747 "<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)"],
748 tund => ["Turn undead",
505 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 749 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
750 elec => ["Electricity",
506 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 751 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
752 cold => ["Cold",
507 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit",
508 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
509 ); 756 );
510 for (qw/slow holyw conf fire depl magic 757 for (qw/slow holyw conf fire depl magic
511 drain acid pois para deat phys 758 drain acid pois para deat phys
512 blind fear tund elec cold ghit/) 759 blind fear tund elec cold ghit/)
513 { 760 {
514 $tbl2->add ($col, $row, 761 $tbl2->add ($col, $row,
515 $STATWIDS->{"res_$_"} = 762 $STATWIDS->{"res_$_"} =
516 new CFClient::UI::Label 763 new CFPlus::UI::Label
517 font => $FONT_FIXED, 764 font => $FONT_FIXED,
518 template => "-100%", 765 template => "-100%",
519 align => +1, 766 align => +1,
520 valign => 0, 767 valign => 0,
521 can_events => 1, 768 can_events => 1,
522 can_hover => 1, 769 can_hover => 1,
523 tooltip => $resist_names{$_}, 770 tooltip => $resist_names{$_}->[1],
524 ); 771 );
525 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
526 font => $FONT_FIXED, 773 font => $FONT_FIXED,
527 can_hover => 1, 774 can_hover => 1,
528 can_events => 1, 775 can_events => 1,
529 image => "ui/resist/resist_$_.png", 776 path => "ui/resist/resist_$_.png",
530 tooltip => $resist_names{$_}, 777 tooltip => $resist_names{$_}->[1],
778 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED,
782 can_hover => 1,
783 can_events => 1,
784 tooltip => $resist_names{$_}->[1],
531 ); 785 );
532 786
533 $row++; 787 $row++;
534 if ($row % 6 == 0) { 788 if ($row % 6 == 0) {
535 $col += 2; 789 $col += 3;
536 $row = 0; 790 $row = 0;
537 } 791 }
538 } 792 }
539 793
540 &set_stats_window_fontsize;
541 update_stats_window ({}); 794 #update_stats_window ({});
542 795
796 $r
797}
798
799sub skill_window {
800 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
801 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
543 $tgw 802 $sw
544} 803}
545 804
546sub formsep { 805sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 806 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548}
549
550sub update_stats_window {
551 my ($stats) = @_;
552
553 # I love text protocols...
554
555 my $hp = $stats->{+CS_STAT_HP} * 1;
556 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
557 my $sp = $stats->{+CS_STAT_SP} * 1;
558 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
559 my $fo = $stats->{+CS_STAT_FOOD} * 1;
560 my $fo_m = 999;
561 my $gr = $stats->{+CS_STAT_GRACE} * 1;
562 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
563
564 $GAUGES->{hp} ->set_value ($hp, $hp_m);
565 $GAUGES->{mana} ->set_value ($sp, $sp_m);
566 $GAUGES->{food} ->set_value ($fo, $fo_m);
567 $GAUGES->{grace} ->set_value ($gr, $gr_m);
568 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
569 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
570 my $rng = $stats->{+CS_STAT_RANGE};
571 $rng =~ s/^Range: //; # thank you so much dear server
572 $GAUGES->{range} ->set_text ("Rng: " . $rng);
573 my $title = $stats->{+CS_STAT_TITLE};
574 $title =~ s/^Player: //;
575 $STATWIDS->{title} ->set_text ("Title: " . $title);
576
577 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
578 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
579 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
580 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
581 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
582 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
583 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
584 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
585 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
586 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
587 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
588 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
589 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
590
591 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
592
593 # TODO: replace by CS_STAT_RES_xxx constants
594 my %tbl = (
595 phys => 100,
596 magic => 101,
597 fire => 102,
598 elec => 103,
599 cold => 104,
600 conf => 105,
601 acid => 106,
602 drain => 107,
603 ghit => 108,
604 pois => 109,
605 slow => 110,
606 para => 111,
607 tund => 112,
608 fear => 113,
609 depl => 113,
610 deat => 115,
611 holyw => 116,
612 blind => 117,
613 );
614
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl;
617}
618
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} 807}
628 808
629my $METASERVER_ATIME; 809my $METASERVER_ATIME;
630 810
631sub update_metaserver { 811sub update_metaserver {
632 my ($HOST) = @_; 812 my ($metaserver_dialog) = @_;
813
814 $METASERVER = $metaserver_dialog
815 if defined $metaserver_dialog;
633 816
634 return if $METASERVER_ATIME > time; 817 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 818 $METASERVER_ATIME = time + 60;
636 819
637 my $table = $METASERVER->{table}; 820 my $table = $METASERVER->{table};
638 $table->clear; 821 $table->clear;
639 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
640 823
641 my $buf; 824 my $buf;
642 825
643 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
644 827
… …
659 842
660 utf8::decode $buf if utf8::valid $buf; 843 utf8::decode $buf if utf8::valid $buf;
661 844
662 $table->clear; 845 $table->clear;
663 846
847 my @tip = (
848 "The current number of users logged in on the server.",
849 "The hostname of the server.",
850 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.",
853 );
664 my @col = qw(Use #Users Host Uptime Version Description); 854 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 855 $table->add ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 859 for 0 .. $#col;
667 860
668 my @align = qw(1 0 1 1 -1); 861 my @align = qw(1 0 1 1 -1);
669 862
670 my $y = 0; 863 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
688 881
689 $m = [$users, $host, $uptime, $version, $desc]; 882 $m = [$users, $host, $uptime, $version, $desc];
690 883
691 $y++; 884 $y++;
692 885
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 887 (new CFPlus::UI::Button
888 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
892 $METASERVER->hide;
893 0
894 },
696 }), 895 ),
697 (new CFClient::UI::Empty expand => 1), 896 (new CFPlus::UI::Empty expand => 1),
698 ]); 897 ]);
699 898
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 899 $table->add ($_, $y, new CFPlus::UI::Label
701 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 900 ellipsise => 0,
901 align => $align[$_],
902 text => $m->[$_],
903 tooltip => $tip[$_],
904 can_hover => 1,
905 can_events => 1,
906 fontsize => 0.8)
702 for 0 .. $#$m; 907 for 0 .. $#$m;
703 } 908 }
704 } 909 }
705 }); 910 });
706} 911}
707 912
913sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917
918 my $dialog = new CFPlus::UI::FancyFrame
919 title => "Server List",
920 name => 'metaserver_dialog',
921 x => 'center',
922 y => 'center',
923 z => 3,
924 force_h => $::HEIGHT * 0.4,
925 child => $vbox,
926 has_close_button => 1,
927 table => $table,
928 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1];
930 0
931 },
932 ;
933
934 $dialog
935}
936
708sub server_setup { 937sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 938 my $vbox = new CFPlus::UI::VBox;
710 name => "server_setup", 939
711 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox);
713
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
715 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
716 942
717 { 943 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
719 945
720 $vbox->add ( 946 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFPlus::UI::Entry
722 expand => 1, 948 expand => 1,
723 text => $CFG->{host}, 949 text => $CFG->{profile}{default}{host},
724 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725 connect_changed => sub { 951 on_changed => sub {
726 my ($self, $value) = @_; 952 my ($self, $value) = @_;
727 $CFG->{host} = $value; 953 $CFG->{profile}{default}{host} = $value;
954 0
728 } 955 }
729 ); 956 );
730 957
731 $METASERVER = metaserver_dialog;
732
733 $vbox->add (new CFClient::UI::Flopper 958 $vbox->add (new CFPlus::UI::Button
734 expand => 1, 959 expand => 1,
735 text => "Server List", 960 text => "Server List",
736 other => $METASERVER, 961 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 962 tooltip => "Show a list of available crossfire servers",
738 connect_open => sub { 963 on_activate => sub { $METASERVER->toggle_visibility; 0 },
739 update_metaserver $HOST; 964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
740 }
741 ); 965 );
742 } 966 }
743 967
744 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
745 $table->add (1, 4, new CFClient::UI::Entry 969 $table->add (1, 4, new CFPlus::UI::Entry
746 text => $CFG->{user}, 970 text => $CFG->{profile}{default}{user},
747 tooltip => "The name of your character on the server", 971 tooltip => "The name of your character on the server",
748 connect_changed => sub { 972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
749 my ($self, $value) = @_;
750 $CFG->{user} = $value;
751 }
752 ); 973 );
753 974
754 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
755 $table->add (1, 5, new CFClient::UI::Entry 976 $table->add (1, 5, new CFPlus::UI::Entry
756 text => $CFG->{password}, 977 text => $CFG->{profile}{default}{password},
757 hidden => 1, 978 hidden => 1,
758 tooltip => "The password for your character", 979 tooltip => "The password for your character",
759 connect_changed => sub { 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
760 my ($self, $value) = @_;
761 $CFG->{password} = $value;
762 }
763 ); 981 );
764 982
765 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
766 $table->add (1, 7, new CFClient::UI::Slider 984 $table->add (1, 7, new CFPlus::UI::Slider
767 req_w => 100, 985 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 986 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 tooltip => "This is the size of the portion of the map update the server sends you. " 987 tooltip => "This is the size of the portion of the map update the server sends you. "
770 . "If you set this to a high value you will be able to see further, " 988 . "If you set this to a high value you will be able to see further, "
771 . "but you also increase bandwidth requirements and latency. " 989 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 990 . "This option is only used once at log-in.",
773 connect_changed => sub { 991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
774 my ($self, $value) = @_;
775
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 },
778 ); 992 );
779 993
780 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
781 $table->add (1, 8, new CFClient::UI::CheckBox 995 $table->add (1, 8, new CFPlus::UI::CheckBox
782 state => $CFG->{face_prefetch}, 996 state => $CFG->{face_prefetch},
783 tooltip => "<b>Background Image Prefetch</b>\n\n" 997 tooltip => "<b>Background Image Prefetch</b>\n\n"
784 . "If enabled, the client automatically pre-fetches images from the server. " 998 . "If enabled, the client automatically pre-fetches images from the server. "
785 . "This might increase or create lag, but increases the chances " 999 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 1000 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 1001 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 1002 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 1003 . "This option can be set and unset any time.",
790 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
791 ); 1005 );
792 1006
793 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
794 $table->add (1, 9, new CFClient::UI::Entry 1008 $table->add (1, 9, new CFPlus::UI::Entry
795 text => $CFG->{output_count}, 1009 text => $CFG->{output_count},
796 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
797 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
798 ); 1012 );
799 1013
800 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
801 $table->add (1, 10, new CFClient::UI::Entry 1015 $table->add (1, 10, new CFPlus::UI::Entry
802 text => $CFG->{output_sync}, 1016 text => $CFG->{output_sync},
803 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
804 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
805 ); 1019 );
806 1020
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
808 expand => 1, 1022 expand => 1,
809 align => 0, 1023 align => 0,
810 text => "Login", 1024 text => "Login",
811 connect_activate => sub { 1025 on_activate => sub {
812 $CONN ? stop_game 1026 $CONN ? stop_game
813 : start_game; 1027 : start_game;
1028 0
814 }, 1029 },
815 ); 1030 );
816 1031
817 $dialog 1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command},
1035 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub {
1039 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value;
1041 0
1042 }
1043 );
1044
1045 $vbox->add (new CFPlus::UI::Label
1046 text => "Server Info",
1047 fontsize => 1.2,
1048 padding_y => 8,
1049 fg => [1, 1, 0, 1],
1050 );
1051
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1053
1054 $vbox
818} 1055}
819 1056
820sub message_window { 1057sub message_window {
821 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFPlus::UI::FancyFrame
822 name => "message_window", 1059 name => "message_window",
823 title => "Messages", 1060 title => "Messages",
824 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 1062 x => "max",
826 user_w => int $::WIDTH / 3, 1063 y => 0,
1064 force_w => $::WIDTH * 0.4,
827 user_h => int $::HEIGHT / 5, 1065 force_h => $::HEIGHT * 0.5,
828 child => (my $vbox = new CFClient::UI::VBox); 1066 child => (my $vbox = new CFPlus::UI::VBox),
1067 has_close_button => 1;
829 1068
830 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
831 1070
832 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFPlus::UI::Entry
833 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
834 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1073 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
835 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1074 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
836 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
837 connect_focus_in => sub { 1076 on_focus_in => sub {
838 my ($input, $prev_focus) = @_; 1077 my ($input, $prev_focus) = @_;
839 1078
840 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
841 1080
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 1082 $input->{refocus_map} = 1;
844 } 1083 }
845 delete $input->{auto_activated}; 1084 delete $input->{auto_activated};
1085
1086 0
846 }, 1087 },
847 connect_activate => sub { 1088 on_activate => sub {
848 my ($input, $text) = @_; 1089 my ($input, $text) = @_;
849 $input->set_text (''); 1090 $input->set_text ('');
850 1091
851 if ($text =~ /^\/(.*)/) { 1092 if ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 1093 $::CONN->user_send ($1);
… …
856 } 1097 }
857 if ($input->{refocus_map}) { 1098 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 1099 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 1100 $MAPWIDGET->focus_in
860 } 1101 }
1102
1103 0
861 }, 1104 },
862 connect_escape => sub { 1105 on_escape => sub {
863 $MAPWIDGET->focus_in 1106 $MAPWIDGET->grab_focus;
1107
1108 0
864 }, 1109 },
865 ); 1110 );
866 1111
867 $CONSOLE = { 1112 $CONSOLE = {
868 window => $window, 1113 window => $window,
869 input => $input 1114 input => $input,
870 }; 1115 };
871 1116
872 $window 1117 $window
1118}
1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
873} 1137}
874 1138
875sub open_quit_dialog { 1139sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
877 1151
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
879
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
881 1153
882 $vb->add (new CFClient::UI::Label 1154 $vb->add (new CFPlus::UI::Label
883 text => "You should find a savebed and apply it first!", 1155 text => "You should find a savebed and apply it first!",
884 max_w => $WIDTH * 0.25, 1156 max_w => $WIDTH * 0.25,
885 ellipsize => 0, 1157 ellipsize => 0,
886 ); 1158 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 1160 $hb->add (new CFPlus::UI::Button
889 text => "Ok", 1161 text => "Ok",
890 expand => 1, 1162 expand => 1,
891 connect_activate => sub { $QUIT_DIALOG->hide }, 1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
892 ); 1164 );
893 $hb->add (new CFClient::UI::Button 1165 $hb->add (new CFPlus::UI::Button
894 text => "Quit anyway", 1166 text => "Quit anyway",
895 expand => 1, 1167 expand => 1,
896 connect_activate => sub { exit }, 1168 on_activate => sub { exit },
897 );
898
899 $QUIT_DIALOG->show_centered;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 }
903}
904
905sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";
908
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
910
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
917 $vb2->add (my $hb2 = new CFClient::UI::HBox);
918 $hb2->add (new CFClient::UI::Button
919 text => "Close",
920 tooltip => "Close the currently open container (if one is open)",
921 connect_activate => sub {
922 $CONN->send ("apply $CONN->{open_container}")
923 if $CONN->{open_container} != 0;
924 },
925 );
926 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
927
928 $INVR_LBL->set_text ("Floor");
929 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
930
931 $invwin
932}
933
934sub make_help_window {
935 my $win = new CFClient::UI::FancyFrame
936 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
937
938 $win->add (my $vbox = new CFClient::UI::VBox);
939
940 $vbox->add (my $buttons = new CFClient::UI::HBox);
941 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
942
943 for (
944 [intro => "Introduction"],
945 [manual => "Manual"],
946 [command_help => "Commands"],
947 [skill_help => "Skills"],
948 ) {
949 my ($pod, $label) = @$_;
950
951 $buttons->add (new CFClient::UI::Button
952 text => $label,
953 connect_activate => sub {
954 my $parser = new Pod::POM;
955 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
956
957 $viewer->clear;
958
959 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
960 for @{ CFClient::pod_to_pango_list $pom };
961
962 $viewer->set_offset (0);
963 },
964 ); 1169 );
965 } 1170 }
966 1171
967 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174}
1175
1176sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table;
1178
1179 for (
1180 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT],
1183 ["Stop before pickup" => PICKUP_STOP],
1184 ["Debug autopickup" => PICKUP_DEBUG],
1185 ],
1186 ["Weapons", 0, 6,
1187 ["All weapons" => PICKUP_ALLWEAPON],
1188 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1189 ["Bows" => PICKUP_BOW],
1190 ["Arrows" => PICKUP_ARROW],
1191 ],
1192 ["Armour", 0, 12,
1193 ["Helmets" => PICKUP_HELMET],
1194 ["Shields" => PICKUP_SHIELD],
1195 ["Body Armour" => PICKUP_ARMOUR],
1196 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK],
1199 ],
1200
1201 ["Readables", 2, 2,
1202 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ],
1206 ["Misc", 2, 7,
1207 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS],
1216 ],
1217 ["Weight/Value ratio", 2, 17]
1218 )
1219 {
1220 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222
1223 for (@bits) {
1224 ++$y;
1225
1226 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub {
1231 my ($box, $value) = @_;
1232
1233 if ($value) {
1234 $::CFG->{pickup} |= $mask;
1235 } else {
1236 $::CFG->{pickup} &= ~$mask;
1237 }
1238
1239 $::CONN->send_command ("pickup $::CFG->{pickup}")
1240 if defined $::CONN;
1241
1242 0
1243 });
1244
1245 ${$_->[2]} = $checkbox if $_->[2];
1246 }
1247 }
1248
1249 $table->add (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub {
1254 my ($slider, $value) = @_;
1255
1256 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value
1258 if $value;
1259 1;
1260 });
1261
1262 $table->add (3, 18, new CFPlus::UI::Button
1263 text => "set",
1264 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN;
1267 0
1268 });
1269
1270 $table
1271}
1272
1273my %SORT_ORDER = (
1274 type => undef,
1275 mtime => sub { sort {
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime}
1278 or $a->{type} <=> $b->{type}
1279 } @_ },
1280 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type}
1283 } @_ },
1284);
1285
1286sub inventory_widget {
1287 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1288
1289 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1290 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1291
1292 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1293
1294 use sort 'stable';
1295
1296 $hb1->add (new CFPlus::UI::Selector
1297 value => $::CFG->{inv_sort},
1298 options => [
1299 [type => "Type/Name"],
1300 [mtime => "Recent/Normal/Locked"],
1301 [weight => "Weight/Type"],
1302 ],
1303 on_changed => sub {
1304 $::CFG->{inv_sort} = $_[1];
1305 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1306 },
1307 );
1308 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1309 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1314
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318
1319 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1320 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1321
1322 # XXX: Call after $INVR = ... because set_opencont sets the items
1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1324
1325 $hb
1326}
1327
1328sub toggle_player_page {
1329 my ($widget) = @_;
1330
1331 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1332 $PL_WINDOW->hide;
1333 } else {
1334 $PL_NOTEBOOK->set_current_page ($widget);
1335 $PL_WINDOW->show;
1336 }
1337}
1338
1339sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1341 x => "center",
1342 y => "center",
1343 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10,
1345 title => "Player",
1346 name => "playerbook",
1347 has_close_button => 1
1348 ;
1349
1350 my $ntb =
1351 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1;
1353
1354 $ntb->add (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown."
1357 );
1358 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills."
1361 );
1362
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1365 $ntb->add (
1366 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 );
1369 $ntb->add (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 );
1374
1375 $ntb->set_current_page ($INVENTORY_PAGE);
1376
1377 $plwin->add ($ntb);
1378 $plwin
1379}
1380
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox;
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491}
1492
1493sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame
1495 x => 'center',
1496 y => 'center',
1497 z => 2,
1498 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser",
1502 has_close_button => 1;
1503
1504 $win->add (my $vbox = new CFPlus::UI::VBox);
1505
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4);
1509
1510 my @history;
1511 my @future;
1512 my $node;
1513
1514 my $load_node; $load_node = sub {
1515 my ($node) = @_;
1516
1517 $buttons->clear;
1518
1519 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button label => "&lt;", on_activate => sub {
1521 unshift @future, $node if $node;
1522 $node = pop @history;
1523
1524 });
1525 }
1526 $viewer->clear;
1527 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $node);
1528 $viewer->set_offset (0);
1529 };
1530
1531 $load_node->(CFPlus::Pod::find pod => "mainpage");
1532
1533 $CFPlus::Pod::on_link = sub {
1534 my (@path) = @_;
1535
1536 push @history, $node if $node;
1537 @future = ();
1538
1539 $load_node->(CFPlus::Pod::find @path);
1540 $win->show;
1541 };
968 1542
969 $win 1543 $win
970} 1544}
971 1545
972sub sdl_init { 1546sub sdl_init {
973 CFClient::SDL_Init 1547 CFPlus::SDL_Init
974 and die "SDL::Init failed!\n"; 1548 and die "SDL::Init failed!\n";
975} 1549}
976 1550
977sub video_init { 1551sub video_init {
978 sdl_init; 1552 sdl_init;
… …
983 1557
984 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1558 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
985 $FULLSCREEN = $CFG->{fullscreen}; 1559 $FULLSCREEN = $CFG->{fullscreen};
986 $FAST = $CFG->{fast}; 1560 $FAST = $CFG->{fast};
987 1561
988 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1562 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
989 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1563 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
990 1564
991 $SDL_ACTIVE = 1; 1565 $SDL_ACTIVE = 1;
992 $LAST_REFRESH = time - 0.01; 1566 $LAST_REFRESH = time - 0.01;
993 1567
994 CFClient::OpenGL::init; 1568 CFPlus::OpenGL::init;
995 1569
996 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1570 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
997 1571
998 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1572 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
999 1573
1000 ############################################################################# 1574 #############################################################################
1001 1575
1002 if ($DEBUG_STATUS) { 1576 if ($DEBUG_STATUS) {
1003 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1577 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1004 } else { 1578 } else {
1005 # create the widgets 1579 # create the widgets
1006 1580
1007 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1581 $DEBUG_STATUS = new CFPlus::UI::Label
1582 padding => 0,
1583 z => 100,
1584 force_x => "max",
1585 force_y => 0;
1008 $DEBUG_STATUS->show; 1586 $DEBUG_STATUS->show;
1009 1587
1588 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1589
1010 $STATUSBOX = new CFClient::UI::Statusbox; 1590 $STATUSBOX = new CFPlus::UI::Statusbox;
1011 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1012 1592
1013 (new CFClient::UI::Frame 1593 (new CFPlus::UI::Frame
1014 bg => [0, 0, 0, 0.4], 1594 bg => [0, 0, 0, 0.4],
1015 req_y => -1, 1595 force_x => 0,
1596 force_y => "max",
1016 child => $STATUSBOX, 1597 child => $STATUSBOX,
1017 )->show; 1598 )->show;
1018 1599
1019 CFClient::UI::FancyFrame->new ( 1600 CFPlus::UI::FancyFrame->new (
1601 title => "Map",
1602 name => "mapmap",
1603 x => 0,
1604 y => $FONTSIZE + 8,
1020 border_bg => [1, 1, 1, 192/255], 1605 border_bg => [1, 1, 1, 192/255],
1021 bg => [1, 1, 1, 0], 1606 bg => [1, 1, 1, 0],
1022 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1607 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1023 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1608 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1024 ), 1609 ),
1025 )->show; 1610 )->show;
1026 1611
1027 $MAPWIDGET = new CFClient::MapWidget; 1612 $MAPWIDGET = new CFPlus::MapWidget;
1028 $MAPWIDGET->connect (activate_console => sub { 1613 $MAPWIDGET->connect (activate_console => sub {
1029 my ($mapwidget, $preset) = @_; 1614 my ($mapwidget, $preset) = @_;
1030 1615
1031 if ($CONSOLE) { 1616 if ($CONSOLE) {
1032 $CONSOLE->{input}->{auto_activated} = 1; 1617 $CONSOLE->{input}->{auto_activated} = 1;
1033 $CONSOLE->{input}->focus_in; 1618 $CONSOLE->{input}->grab_focus;
1034 1619
1035 if ($preset && $CONSOLE->{input}->get_text eq '') { 1620 if ($preset && $CONSOLE->{input}->get_text eq '') {
1036 $CONSOLE->{input}->set_text ($preset); 1621 $CONSOLE->{input}->set_text ($preset);
1037 } 1622 }
1038 } 1623 }
1039 }); 1624 });
1040 $MAPWIDGET->show; 1625 $MAPWIDGET->show;
1041 $MAPWIDGET->focus_in; 1626 $MAPWIDGET->grab_focus;
1042 1627
1043 $LOGVIEW = new CFClient::UI::TextView 1628 $LOGVIEW = new CFPlus::UI::TextScroller
1044 expand => 1, 1629 expand => 1,
1045 font => $FONT_FIXED, 1630 font => $FONT_FIXED,
1046 fontsize => $::CFG->{log_fontsize}, 1631 fontsize => $::CFG->{log_fontsize},
1632 indent => -4,
1047 can_hover => 1, 1633 can_hover => 1,
1048 can_events => 1, 1634 can_events => 1,
1049 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1635 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1050 ; 1636 ;
1051 1637
1052 $BUTTONBAR = new CFClient::UI::HBox; 1638 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1639 title => "Setup",
1640 name => "setup_dialog",
1641 x => 'center',
1642 y => 'center',
1643 z => 2,
1644 force_w => $::WIDTH * 0.6,
1645 force_h => $::HEIGHT * 0.6,
1646 has_close_button => 1,
1647 ;
1053 1648
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1649 $METASERVER = metaserver_dialog;
1055 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1650
1056 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1652 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1653
1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1057 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1655 "Configure the server to play on, your username, password and other server-related options.");
1656 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1657 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1659 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1660 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1661 "Configure the use of audio, sound effects and background music.");
1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1663 "Lets you define, edit and delete key bindings."
1664 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1665 . "with nothing set and the recording started. After doing the actions you "
1666 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1667 . "After pressing the combo the binding will be saved automatically and the "
1668 . "binding editor closes");
1669 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1670 "Some debuggin' options. Do not ask.");
1671
1672 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1673
1674 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1675 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1676
1058 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1677 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1059 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1060 1679
1061 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 1680 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
1062 1681
1063 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1064 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1682 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1066 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1683 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1067 1684
1068 $BUTTONBAR->add (new CFClient::UI::Button 1685 $BUTTONBAR->add (new CFPlus::UI::Button
1069 text => "Save Config", 1686 text => "Save Config",
1070 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1687 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1071 connect_activate => sub { 1688 on_activate => sub {
1072 $::CFG->{layout} = CFClient::UI::get_layout; 1689 $::CFG->{layout} = CFPlus::UI::get_layout;
1073 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1690 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1074 status "Configuration Saved"; 1691 status "Configuration Saved";
1692 0
1075 }, 1693 },
1076 ); 1694 );
1077 1695
1078 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1696 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1079 tooltip => "View Documentation"); 1697 tooltip => "View Documentation");
1080 1698
1081 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFPlus::UI::Button
1082 text => "Quit", 1700 text => "Quit",
1083 tooltip => "Terminates the program", 1701 tooltip => "Terminates the program",
1084 connect_activate => sub { 1702 on_activate => sub {
1085 if ($CONN) { 1703 if ($CONN) {
1086 open_quit_dialog; 1704 open_quit_dialog;
1087 } else { 1705 } else {
1088 exit; 1706 exit;
1089 } 1707 }
1708 0
1090 }, 1709 },
1091 ); 1710 );
1092 1711
1093 $BUTTONBAR->show; 1712 $BUTTONBAR->show;
1094 1713 $SETUP_DIALOG->show;
1095 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1096
1097 # delay till geometry is constant
1098 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1099 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1100 my $widget = $GAUGES->{win};
1101 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1102 });
1103 force_refresh ();
1104 } 1714 }
1715
1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1105} 1717}
1106 1718
1107sub video_shutdown { 1719sub video_shutdown {
1720 CFPlus::OpenGL::shutdown;
1721
1108 undef $SDL_ACTIVE; 1722 undef $SDL_ACTIVE;
1109} 1723}
1110 1724
1111my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1112my $bgmusic;#TODO#hack#d# 1726my $bgmusic;#TODO#hack#d#
… …
1119 1733
1120sub audio_music_finished { 1734sub audio_music_finished {
1121 return unless $CFG->{bgm_enable}; 1735 return unless $CFG->{bgm_enable};
1122 1736
1123 # TODO: hack, do play loop and mood music 1737 # TODO: hack, do play loop and mood music
1124 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1738 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1125 $bgmusic->play (0); 1739 $bgmusic->play (0);
1126 1740
1127 push @bgmusic, shift @bgmusic; 1741 push @bgmusic, shift @bgmusic;
1128} 1742}
1129 1743
1130sub audio_init { 1744sub audio_init {
1131 if ($CFG->{audio_enable}) { 1745 if ($CFG->{audio_enable}) {
1132 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1746 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1133 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1747 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1134 1748
1135 unless ($SDL_MIXER) { 1749 unless ($SDL_MIXER) {
1136 status "Unable to open sound device: there will be no sound"; 1750 status "Unable to open sound device: there will be no sound";
1137 return; 1751 return;
1138 } 1752 }
1139 1753
1140 CFClient::Mix_AllocateChannels 8; 1754 CFPlus::Mix_AllocateChannels 8;
1141 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1755 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1142 1756
1143 audio_music_finished; 1757 audio_music_finished;
1144 1758
1145 while (<$fh>) { 1759 while (<$fh>) {
1146 next if /^\s*#/; 1760 next if /^\s*#/;
… …
1149 my ($file, $volume, $event) = split /\s+/, $_, 3; 1763 my ($file, $volume, $event) = split /\s+/, $_, 3;
1150 1764
1151 push @SOUNDS, "$volume,$file"; 1765 push @SOUNDS, "$volume,$file";
1152 1766
1153 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1767 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1154 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1768 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1155 $chunk->volume ($volume * 128 / 100); 1769 $chunk->volume ($volume * 128 / 100);
1156 $chunk 1770 $chunk
1157 }; 1771 };
1158 } 1772 }
1159 } else { 1773 } else {
… …
1161 } 1775 }
1162 } 1776 }
1163} 1777}
1164 1778
1165sub audio_shutdown { 1779sub audio_shutdown {
1166 CFClient::Mix_CloseAudio if $SDL_MIXER; 1780 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1167 undef $SDL_MIXER; 1781 undef $SDL_MIXER;
1168 @SOUNDS = (); 1782 @SOUNDS = ();
1169 %AUDIO_CHUNKS = (); 1783 %AUDIO_CHUNKS = ();
1170} 1784}
1171 1785
… …
1176 1790
1177my %demo;#d# 1791my %demo;#d#
1178 1792
1179sub force_refresh { 1793sub force_refresh {
1180 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1794 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1181 debug sprintf "%3.2f", $fps; 1795 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1182 1796
1183 $CFClient::UI::ROOT->draw; 1797 $CFPlus::UI::ROOT->draw;
1184 1798
1185 $WANT_REFRESH = 0; 1799 $WANT_REFRESH = 0;
1186 $CAN_REFRESH = 0; 1800 $CAN_REFRESH = 0;
1187 $LAST_REFRESH = $NOW; 1801 $LAST_REFRESH = $NOW;
1188 1802
11890 && do {
1190 # some weird model-drawing code, just a joke right now
1191 use CFClient::OpenGL;
1192
1193 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1194 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1195 $demo{r} ||= do {
1196 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1197 $mod->{v} = pack "f*", @{$mod->{v}};
1198 $_ = [scalar @$_, pack "S!*", @$_]
1199 for values %{$mod->{g}};
1200 $mod
1201 };
1202
1203 my $r = $demo{r} or die;
1204
1205 glDepthMask 1;
1206 glClear GL_DEPTH_BUFFER_BIT;
1207 glEnable GL_TEXTURE_2D;
1208 glEnable GL_DEPTH_TEST;
1209 glEnable GL_CULL_FACE;
1210 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1211
1212 glMatrixMode GL_PROJECTION;
1213 glLoadIdentity;
1214 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1215 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1216 glMatrixMode GL_MODELVIEW;
1217 glLoadIdentity;
1218
1219 glPushMatrix;
1220 glTranslate 0, 0, -800;
1221 glScale 1, -1, 1;
1222 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1223 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1224 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1225 glScale 50, 50, 50;
1226
1227 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1228 while (my ($k, $v) = each %{$r->{g}}) {
1229 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1230 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1231 }
1232
1233 glPopMatrix;
1234
1235 glShadeModel GL_FLAT;
1236 glDisable GL_DEPTH_TEST;
1237 glDisable GL_TEXTURE_2D;
1238 glDepthMask 0;
1239
1240 $WANT_REFRESH++;
1241};
1242
1243 CFClient::SDL_GL_SwapBuffers; 1803 CFPlus::SDL_GL_SwapBuffers;
1244} 1804}
1245 1805
1246my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1806my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1247 $NOW = time; 1807 $NOW = time;
1248 1808
1249 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1809 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1250 for CFClient::SDL_PollEvent; 1810 for CFPlus::SDL_PollEvent;
1251 1811
1252 if (%animate_object) { 1812 if (%animate_object) {
1253 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1813 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1254 $WANT_REFRESH++; 1814 $WANT_REFRESH++;
1255 } 1815 }
… …
1279 $CONN->face_prefetch 1839 $CONN->face_prefetch
1280 if $CONN; 1840 if $CONN;
1281}); 1841});
1282 1842
1283%SDL_CB = ( 1843%SDL_CB = (
1284 CFClient::SDL_QUIT => sub { 1844 CFPlus::SDL_QUIT => sub {
1285 Event::unloop -1; 1845 Event::unloop -1;
1286 }, 1846 },
1287 CFClient::SDL_VIDEORESIZE => sub { 1847 CFPlus::SDL_VIDEORESIZE => sub {
1288 }, 1848 },
1289 CFClient::SDL_VIDEOEXPOSE => sub { 1849 CFPlus::SDL_VIDEOEXPOSE => sub {
1290 CFClient::UI::full_refresh; 1850 CFPlus::UI::full_refresh;
1291 }, 1851 },
1292 CFClient::SDL_ACTIVEEVENT => sub { 1852 CFPlus::SDL_ACTIVEEVENT => sub {
1293# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1853# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1294 }, 1854 },
1295 CFClient::SDL_KEYDOWN => sub { 1855 CFPlus::SDL_KEYDOWN => sub {
1296 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1856 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1297 # alt-enter 1857 # alt-enter
1858 $FULLSCREEN_ENABLE->toggle;
1298 video_shutdown; 1859 video_shutdown;
1299 $CFG->{fullscreen} = !$CFG->{fullscreen};
1300 video_init; 1860 video_init;
1301 } else { 1861 } else {
1302 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1862 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1303 } 1863 }
1304 }, 1864 },
1305 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1865 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1306 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1866 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1307 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1867 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1308 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1868 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1309 CFClient::SDL_USEREVENT => sub { 1869 CFPlus::SDL_USEREVENT => sub {
1310 if ($_[0]{code} == 1) { 1870 if ($_[0]{code} == 1) {
1311 audio_channel_finished $_[0]{data1}; 1871 audio_channel_finished $_[0]{data1};
1312 } elsif ($_[0]{code} == 0) { 1872 } elsif ($_[0]{code} == 0) {
1313 audio_music_finished; 1873 audio_music_finished;
1314 } 1874 }
… …
1318############################################################################# 1878#############################################################################
1319 1879
1320$SIG{INT} = $SIG{TERM} = sub { exit }; 1880$SIG{INT} = $SIG{TERM} = sub { exit };
1321 1881
1322{ 1882{
1323 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1324
1325 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1883 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1326 CFClient::UI::set_layout ($::CFG->{layout}); 1884 CFPlus::UI::set_layout ($::CFG->{layout});
1327 1885
1328 my %DEF_CFG = ( 1886 my %DEF_CFG = (
1329 sdl_mode => 0, 1887 sdl_mode => 0,
1330 width => 640, 1888 width => 640,
1331 height => 480, 1889 height => 480,
1332 fullscreen => 0, 1890 fullscreen => 0,
1333 fast => 0, 1891 fast => 0,
1334 map_scale => 1, 1892 map_scale => 1,
1335 fow_enable => 1, 1893 fow_enable => 1,
1336 fow_intensity => 0.45, 1894 fow_intensity => 0.45,
1337 fow_smooth => 0, 1895 fow_smooth => 0,
1338 gui_fontsize => 1, 1896 gui_fontsize => 1,
1339 log_fontsize => 1, 1897 log_fontsize => 0.7,
1340 gauge_fontsize=> 1, 1898 gauge_fontsize => 1,
1341 gauge_size => 0.35, 1899 gauge_size => 0.35,
1342 stat_fontsize => 1, 1900 stat_fontsize => 0.7,
1343 mapsize => 100, 1901 mapsize => 100,
1344 host => "crossfire.schmorp.de",
1345 say_command => 'say', 1902 say_command => 'say',
1346 audio_enable => 1, 1903 audio_enable => 1,
1347 bgm_enable => 1, 1904 bgm_enable => 1,
1348 bgm_volume => 0.25, 1905 bgm_volume => 0.25,
1349 face_prefetch => 0, 1906 face_prefetch => 0,
1350 output_sync => 1, 1907 output_sync => 1,
1351 output_count => 1, 1908 output_count => 1,
1909 pickup => 0,
1910 inv_sort => "mtime",
1911 default => "profile", # default profile
1912 );
1352 ); 1913
1353
1354 while (my ($k, $v) = each %DEF_CFG) { 1914 while (my ($k, $v) = each %DEF_CFG) {
1355 $CFG->{$k} = $v unless exists $CFG->{$k}; 1915 $CFG->{$k} = $v unless exists $CFG->{$k};
1356 } 1916 }
1357 1917
1918 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1919
1358 sdl_init; 1920 sdl_init;
1359 1921
1360 @SDL_MODES = reverse 1922 @SDL_MODES = reverse
1361 grep $_->[0] >= 640 && $_->[1] >= 480, 1923 grep $_->[0] >= 640 && $_->[1] >= 480,
1362 CFClient::SDL_ListModes; 1924 CFPlus::SDL_ListModes;
1363 1925
1364 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1926 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1365 1927
1366 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1928 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1367 1929
1368 { 1930 {
1369 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1931 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1370 DejaVuSans.ttf 1932 DejaVuSans.ttf
1371 DejaVuSansMono.ttf 1933 DejaVuSansMono.ttf
1372 DejaVuSans-Bold.ttf 1934 DejaVuSans-Bold.ttf
1373 DejaVuSansMono-Bold.ttf 1935 DejaVuSansMono-Bold.ttf
1374 DejaVuSans-Oblique.ttf 1936 DejaVuSans-Oblique.ttf
1375 DejaVuSansMono-Oblique.ttf 1937 DejaVuSansMono-Oblique.ttf
1376 DejaVuSans-BoldOblique.ttf 1938 DejaVuSans-BoldOblique.ttf
1377 DejaVuSansMono-BoldOblique.ttf 1939 DejaVuSansMono-BoldOblique.ttf
1378 ); 1940 );
1379 1941
1380 CFClient::add_font $_ for @fonts; 1942 CFPlus::add_font $_ for @fonts;
1381 1943
1382 CFClient::pango_init; 1944 CFPlus::pango_init;
1383 1945
1384 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1946 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1385 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1947 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1386 1948
1387 $FONT_PROP->make_default; 1949 $FONT_PROP->make_default;
1388 } 1950 }
1389 1951
1390# compare mono (ft) vs. rgba (cairo) 1952# compare mono (ft) vs. rgba (cairo)
1391# ft - 1.8s, cairo 3s, even in alpha-only mode 1953# ft - 1.8s, cairo 3s, even in alpha-only mode
1392# for my $rgba (0..1) { 1954# for my $rgba (0..1) {
1393# my $t1 = Time::HiRes::time; 1955# my $t1 = Time::HiRes::time;
1394# for (1..1000) { 1956# for (1..1000) {
1395# my $layout = CFClient::Layout->new ($rgba); 1957# my $layout = CFPlus::Layout->new ($rgba);
1396# $layout->set_text ("hallo" x 100); 1958# $layout->set_text ("hallo" x 100);
1397# $layout->render; 1959# $layout->render;
1398# } 1960# }
1399# my $t2 = Time::HiRes::time; 1961# my $t2 = Time::HiRes::time;
1400# warn $t2-$t1; 1962# warn $t2-$t1;
… …
1403 video_init; 1965 video_init;
1404 audio_init; 1966 audio_init;
1405} 1967}
1406 1968
1407Event::loop; 1969Event::loop;
1970#CFPlus::SDL_Quit;
1971#CFPlus::_exit 0;
1408 1972
1409END { CFClient::SDL_Quit } 1973END { CFPlus::SDL_Quit }
1410 1974
1411=head1 NAME 1975=head1 NAME
1412 1976
1413pclient - A Crossfire+ and Crossfire game client 1977cfplus - A Crossfire+ and Crossfire game client
1414 1978
1415=head1 SYNOPSIS 1979=head1 SYNOPSIS
1416 1980
1417Just run it - no commandline arguments are supported. 1981Just run it - no commandline arguments are supported.
1418 1982
1419=head1 USAGE 1983=head1 USAGE
1420 1984
1421Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1985cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1422fullscreen and interactively. 1986fullscreen and interactively.
1423 1987
1988=head1 DEBUGGING
1989
1990
1991CFPLUS_DEBUG - environment variable
1992
1993 1 draw borders around widgets
1994 2 add low-level widget info to tooltips
1995 4 show fps
1996 8 suppress tooltips
1997
1424=head1 AUTHOR 1998=head1 AUTHOR
1425 1999
1426Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2000Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1427 2001
1428 2002

Diff Legend

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