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.12 by root, Fri May 26 19:14:33 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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