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.1 by root, Thu May 25 16:24:45 2006 UTC vs.
Revision 1.79 by root, Fri Jun 23 23:54:31 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; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
38use CFClient::OpenGL ();
39use CFClient::Protocol;
39use CFClient::UI; 40use CFClient::UI;
40use CFClient::MapWidget; 41use CFClient::MapWidget;
41 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
42$Event::DIED = sub { 45$Event::DIED = sub {
43 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
44 CFClient::error $_[1]; 48 CFClient::error $_[1];
45}; 49};
46 50
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48 52
… …
50 54
51my $MAX_FPS = 60; 55my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 56my $MIN_FPS = 5; # unused as of yet
53 57
54our $META_SERVER = "crossfire.real-time.com:13326"; 58our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 59
60our $LAST_REFRESH; 60our $LAST_REFRESH;
61our $NOW; 61our $NOW;
62 62
63our $CFG; 63our $CFG;
… …
83our $LOGVIEW; 83our $LOGVIEW;
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
89our $SERVER_INFO;
88 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
89our $FLOORBOX; 99our $FLOORBOX;
90our $GAUGES; 100our $GAUGES;
91our $STATWIDS; 101our $STATWIDS;
92 102
93our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
99 109
100our $ALT_ENTER_MESSAGE; 110our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 111our $STATUSBOX;
102our $DEBUG_STATUS; 112our $DEBUG_STATUS;
103 113
104our $INVWIN; 114our $INV_WINDOW;
105our $INV; 115our $INV;
106our $INVR; 116our $INVR;
107our $INVR_LBL; 117our $INV_RIGHT_HB;
108our $OPENCONT; 118
119our $BIND_EDITOR;
120our $BIND_UPD_CB;
121
122our $PICKUP_CFG;
109 123
110sub status { 124sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 125 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 126}
113 127
114sub debug { 128sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 129 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 130}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 131
132sub destroy_query_dialog {
133 (delete $_[0]{query_dialog})->destroy
134 if $_[0]{query_dialog};
135}
136
137# server query dialog
138sub server_query {
139 my ($conn, $flags, $prompt) = @_;
140
141 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
142 x => "center",
143 y => "center",
144 title => "Server Query",
145 child => my $vbox = new CFClient::UI::VBox,
146 ;
147
148 my @dialog = my $label = new CFClient::UI::Label
149 max_w => $::WIDTH * 0.4,
150 ellipsise => 0,
151 text => $prompt;
152
153 if ($flags & CS_QUERY_YESNO) {
154 push @dialog, my $hbox = new CFClient::UI::HBox;
155
156 $hbox->add (new CFClient::UI::Button
157 text => "No",
158 on_activate => sub {
159 $conn->send ("reply n");
160 $dialog->destroy;
161 0
162 }
163 );
164 $hbox->add (new CFClient::UI::Button
165 text => "Yes",
166 on_activate => sub {
167 $conn->send ("reply y");
168 destroy_query_dialog $conn;
169 0
170 },
171 );
172
173 $dialog->grab_focus;
174
175 } elsif ($flags & CS_QUERY_SINGLECHAR) {
176 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
177
178 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
179 $MESSAGE_WINDOW->show;
180
181 unshift @dialog, new CFClient::UI::Label
182 max_w => $::WIDTH * 0.4,
183 ellipsise => 0,
184 markup => "\nOr use your keyboard:\n";
185
186 unshift @dialog, my $table = new CFClient::UI::Table;
187
188 $table->add (0, 0, new CFClient::UI::Button
189 text => "Next Race",
190 on_activate => sub {
191 $conn->send ("reply n");
192 destroy_query_dialog $conn;
193 0
194 },
195 );
196 $table->add (2, 0, new CFClient::UI::Button
197 text => "Accept",
198 on_activate => sub {
199 $conn->send ("reply d");
200 destroy_query_dialog $conn;
201 0
202 },
203 );
204
205 unshift @dialog, new CFClient::UI::Label
206 max_w => $::WIDTH * 0.4,
207 ellipsise => 0,
208 markup =>
209 "<big><b>Character Creation: Race</b></big>\n\n"
210 . "Look at the <b>Messages</b> window to see a description of this race "
211 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
212 . "and the center of the screen to see how this race looks like "
213 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
214 . "You can look at another race, or accept this race (you will come back to this race eventually, "
215 . "so you can take your time making this important choice."
216 ;
217
218 } elsif ($prompt =~ /roll new stats/) {
219 if (my $stat = delete $conn->{stat_change_with}) {
220 $conn->send ("reply $stat");
221 destroy_query_dialog $conn;
222 return;
223 }
224
225 $STATS_WINDOW->show;
226 $MESSAGE_WINDOW->hide;
227
228 unshift @dialog, new CFClient::UI::Label
229 max_w => $::WIDTH * 0.4,
230 ellipsise => 0,
231 markup => "\nOr use your keyboard:\n";
232
233 unshift @dialog, my $table = new CFClient::UI::Table;
234
235 # left: re-roll
236 $table->add (0, 0, new CFClient::UI::Button
237 text => "Roll Again",
238 on_activate => sub {
239 $conn->send ("reply y");
240 destroy_query_dialog $conn;
241 0
242 },
243 );
244
245 # center: swap stats
246 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
247 value => $_,
248 options => [
249 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
250 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
251 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
252 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
253 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
254 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
255 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
256 ],
257 ), 1 .. 2;
258
259 $table->add (2, 0, new CFClient::UI::Button
260 text => "Swap Stats",
261 on_activate => sub {
262 $conn->{stat_change_with} = $sw2->{value};
263 $conn->send ("reply $sw1->{value}");
264 destroy_query_dialog $conn;
265 0
266 },
267 );
268 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
269
270 # right: accept
271 $table->add (4, 0, new CFClient::UI::Button
272 text => "Accept",
273 on_activate => sub {
274 $conn->send ("reply n");
275 $STATS_WINDOW->hide;
276 destroy_query_dialog $conn;
277 0
278 },
279 );
280
281 unshift @dialog, new CFClient::UI::Label
282 max_w => $::WIDTH * 0.4,
283 ellipsise => 0,
284 markup =>
285 "<big><b>Character Creation: Stats</b></big>\n\n"
286 . "Look at the <b>Stats</b> window to see your basic stats "
287 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
288 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
289 . "Race selection will influence those values later on."
290 ;
291 }
292
293 push @dialog, my $entry = new CFClient::UI::Entry
294 on_changed => sub {
295 $conn->send ("reply $_[1]");
296 destroy_query_dialog $conn;
297 0
298 },
299 ;
300
301 $entry->grab_focus;
302
303 } else {
304 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
305
306 push @dialog, my $entry = new CFClient::UI::Entry
307 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
308 on_activate => sub {
309 $conn->send ("reply $_[1]");
310 destroy_query_dialog $conn;
311 0
312 },
313 ;
314
315 $entry->grab_focus;
316 }
317
318 $vbox->add (@dialog);
319 $dialog->show;
118} 320}
119 321
120sub start_game { 322sub start_game {
121 status "logging in..."; 323 status "logging in...";
122 324
325 $LOGIN_BUTTON->set_text ("Logout");
326 $SETUP_DIALOG->hide;
327
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 328 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 329
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 330 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
331
126 $MAP = new CFClient::Map $mapsize, $mapsize; 332 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 333
130 $CONN = eval { 334 $CONN = eval {
131 new conn 335 new CFClient::Protocol
132 host => $host, 336 host => $host,
133 port => $port || 13327, 337 port => $port || 13327,
134 user => $CFG->{user}, 338 user => $CFG->{profile}{default}{user},
135 pass => $CFG->{password}, 339 pass => $CFG->{profile}{default}{password},
136 mapw => $mapsize, 340 mapw => $mapsize,
137 maph => $mapsize, 341 maph => $mapsize,
138 ; 342
343 map_widget => $MAPWIDGET,
344 logview => $LOGVIEW,
345 statusbox => $STATUSBOX,
346 map => $MAP,
347 mapmap => $MAPMAP,
348 query => \&server_query,
349
350 sound_play => sub {
351 my ($x, $y, $soundnum, $type) = @_;
352
353 $SDL_MIXER
354 or return;
355
356 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
357 or return;
358
359 $chunk->play;
360 },
139 }; 361 };
140 362
141 if ($CONN) { 363 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 364 CFClient::lowdelay fileno $CONN->{fh};
143 365
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 366 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 367 } else {
151 status "unable to connect"; 368 status "unable to connect";
152 stop_game(); 369 stop_game();
153 } 370 }
154} 371}
155 372
156sub stop_game { 373sub stop_game {
374 $LOGIN_BUTTON->set_text ("Login");
375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
376 $SETUP_DIALOG->show;
377 $INV_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells;
379
157 return unless $CONN; 380 return unless $CONN;
158 381
159 status "connection closed"; 382 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 383
384 destroy_query_dialog $CONN;
161 $CONN->destroy; 385 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 386 $CONN = 0; # false, does not autovivify
163 387
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
168 undef $MAP; 388 undef $MAP;
169} 389}
170 390
171sub client_setup { 391sub graphics_setup {
172 my $dialog = new CFClient::UI::FancyFrame
173 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 392 my $vbox = new CFClient::UI::VBox;
393
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 394 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 395
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 396 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 397 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 398
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 399 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 400 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 401
183 $mode_slider->connect (changed => sub { 402 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 403 my ($self, $value) = @_;
185 404
… …
192 411
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 412 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 413 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 414 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 415 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
198 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value;
200 }
201 ); 417 );
202 418
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 420 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 421 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 422 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 423 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fast} = $value;
210 }
211 ); 424 );
212 425
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 426 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 427 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 428 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 429 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 430 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value;
220 }
221 ); 431 );
222 432
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 433 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 434 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 435 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 436 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 437 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value;
230 }
231 ); 438 );
232 439
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 441 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 442 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
236 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 443 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
237 connect_changed => sub { 444 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value;
240 }
241 ); 445 );
242 446
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 447 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 448 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 449 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 450 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 451 on_changed => sub {
248 my ($self, $value) = @_; 452 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 453 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 454 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
455 0
251 } 456 }
252 ); 457 );
253 458
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 460 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
257 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 462 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 463 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
259 ); 464 );
260 465
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
264 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
266 ); 471 );
267 472
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 474
270 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
272 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 478 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 479 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 480 &set_stats_window_fontsize;
481 0
276 } 482 }
277 ); 483 );
278 484
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 485 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 486 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 489 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 490 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 491 &set_gauge_window_fontsize;
492 0
286 } 493 }
287 ); 494 );
288 495
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 496 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 497 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 498 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 499 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 500 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 501 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 502 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
503 0
296 } 504 }
297 ); 505 );
298 506
299 $table->add (1, $row++, new CFClient::UI::Button 507 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 508 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 509 tooltip => "Apply the video settings",
302 connect_activate => sub { 510 on_activate => sub {
303 video_shutdown (); 511 video_shutdown ();
304 video_init (); 512 video_init ();
513 0
305 } 514 }
306 ); 515 );
516
517 $vbox
518}
519
520sub audio_setup {
521 my $vbox = new CFClient::UI::VBox;
522
523 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
524
525 my $row = 0;
307 526
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 527 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 528 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 529 state => $CFG->{audio_enable},
311 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.", 530 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.",
312 connect_changed => sub { 531 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
313 $CFG->{audio_enable} = $_[1];
314 }
315 ); 532 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 533# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
317# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 534# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 535# $CFG->{effects_volume} = $_[1];
319# }); 536# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 537 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
321 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 538 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 539 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 540 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 541 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 542 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
326 $CFG->{bgm_enable} = $_[1];
327 }
328 ); 543 );
329 $hbox->add (new CFClient::UI::Slider 544 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 546 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 547 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
333 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128;
335 }
336 ); 548 );
337 549
338 $table->add (1, $row++, new CFClient::UI::Button 550 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 551 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 552 tooltip => "Apply the audio settings",
341 connect_activate => sub { 553 on_activate => sub {
342 audio_shutdown (); 554 audio_shutdown ();
343 audio_init (); 555 audio_init ();
556 0
344 } 557 }
345 ); 558 );
346 559
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 560 $vbox
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 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. "
351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
359 $dialog
360} 561}
361 562
362sub set_stats_window_fontsize { 563sub set_stats_window_fontsize {
363 for (values %{$STATWIDS}) { 564 for (values %{$STATWIDS}) {
364 $_->set_fontsize ($::CFG->{stat_fontsize}); 565 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
373 574
374sub make_gauge_window { 575sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 576 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 577
377 my $win = new CFClient::UI::Frame ( 578 my $win = new CFClient::UI::Frame (
378 req_y => -1, 579 force_x => 0,
580 force_y => "max",
379 user_w => $WIDTH, 581 force_w => $WIDTH,
380 user_h => $gh, 582 force_h => $gh,
381 ); 583 );
382 584
383 $win->add (my $hbox = new CFClient::UI::HBox 585 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 586 children => [
385 (new CFClient::UI::HBox expand => 1), 587 (new CFClient::UI::HBox expand => 1),
386 (new CFClient::UI::VBox children => [ 588 (new CFClient::UI::VBox children => [
387 (new CFClient::UI::Empty expand => 1), 589 (new CFClient::UI::Empty expand => 1),
388 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)), 590 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),
389 ]), 591 ]),
390 (my $vbox = new CFClient::UI::VBox), 592 (my $vbox = new CFClient::UI::VBox),
391 ], 593 ],
392 ); 594 );
393 595
… …
421 &set_gauge_window_fontsize; 623 &set_gauge_window_fontsize;
422 624
423 $win 625 $win
424} 626}
425 627
628sub debug_setup {
629 my $table = new CFClient::UI::Table;
630
631 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
632 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
633 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
634 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
635 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
636 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
637 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
638 $table->add (1, 3, new CFClient::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 CFClient::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
426sub make_stats_window { 656sub stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 657 my $tgw = new CFClient::UI::FancyFrame
658 y => $HEIGHT * (2/8),
659 x => "max",
660 title => "Stats",
661 name => "stats_window",
662 has_close_button => 1;
428 663
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 664 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 665 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 666 can_hover => 1, can_events => 1,
432 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 667 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 668 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server)."); 670 tooltip => "The map you are currently on (if supported by the server).");
671
672 $vb->add (my $hb0 = new CFClient::UI::HBox);
673 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
674 can_hover => 1, can_events => 1,
675 tooltip => "The weight of the player including all inventory items.");
676 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
677 can_hover => 1, can_events => 1,
678 tooltip => "The weight limit: you cannot carry more than this.");
679
436 680
437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 681 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 682 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
439 683
440 my $color2 = [1, 1, 0]; 684 my $color2 = [1, 1, 0];
… …
505 ); 749 );
506 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
507 font => $FONT_FIXED, 751 font => $FONT_FIXED,
508 can_hover => 1, 752 can_hover => 1,
509 can_events => 1, 753 can_events => 1,
510 image => "ui/resist/resist_$_.png", 754 path => "ui/resist/resist_$_.png",
511 tooltip => $resist_names{$_}, 755 tooltip => $resist_names{$_},
512 ); 756 );
513 757
514 $row++; 758 $row++;
515 if ($row % 6 == 0) { 759 if ($row % 6 == 0) {
… …
522 update_stats_window ({}); 766 update_stats_window ({});
523 767
524 $tgw 768 $tgw
525} 769}
526 770
527sub formsep { 771sub formsep($) {
528 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 772 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
529} 773}
530 774
531sub update_stats_window { 775sub update_stats_window {
532 my ($stats) = @_; 776 my ($stats) = @_;
533 777
534 # i love text protocols!!! 778 # I love text protocols...
779
535 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 780 my $hp = $stats->{+CS_STAT_HP} * 1;
536 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 781 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
537 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 782 my $sp = $stats->{+CS_STAT_SP} * 1;
538 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 783 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
539 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 784 my $fo = $stats->{+CS_STAT_FOOD} * 1;
540 my $fo_m = 999; 785 my $fo_m = 999;
541 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 786 my $gr = $stats->{+CS_STAT_GRACE} * 1;
542 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 787 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
543 788
544 $GAUGES->{hp} ->set_value ($hp, $hp_m); 789 $GAUGES->{hp} ->set_value ($hp, $hp_m);
545 $GAUGES->{mana} ->set_value ($sp, $sp_m); 790 $GAUGES->{mana} ->set_value ($sp, $sp_m);
546 $GAUGES->{food} ->set_value ($fo, $fo_m); 791 $GAUGES->{food} ->set_value ($fo, $fo_m);
547 $GAUGES->{grace} ->set_value ($gr, $gr_m); 792 $GAUGES->{grace} ->set_value ($gr, $gr_m);
548 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 793 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
549 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 794 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
550 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 795 my $rng = $stats->{+CS_STAT_RANGE};
551 $rng =~ s/^Range: //; # thank you so much dear server 796 $rng =~ s/^Range: //; # thank you so much dear server
552 $GAUGES->{range} ->set_text ("Rng: " . $rng); 797 $GAUGES->{range} ->set_text ("Rng: " . $rng);
553 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 798 my $title = $stats->{+CS_STAT_TITLE};
554 $title =~ s/^Player: //; 799 $title =~ s/^Player: //;
555 $STATWIDS->{title} ->set_text ("Title: " . $title); 800 $STATWIDS->{title} ->set_text ("Title: " . $title);
556 801
557 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 802 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
558 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 803 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
559 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 804 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
560 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 805 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
561 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 806 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
562 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 807 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
563 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 808 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
564 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 809 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
565 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 810 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
566 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 811 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
567 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 812 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
568 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
569 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 814 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
815
816 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
570 817
571 my %tbl = ( 818 my %tbl = (
572 phys => 100, 819 phys => CS_STAT_RES_PHYS,
573 magic => 101, 820 magic => CS_STAT_RES_MAG,
574 fire => 102, 821 fire => CS_STAT_RES_FIRE,
575 elec => 103, 822 elec => CS_STAT_RES_ELEC,
576 cold => 104, 823 cold => CS_STAT_RES_COLD,
577 conf => 105, 824 conf => CS_STAT_RES_CONF,
578 acid => 106, 825 acid => CS_STAT_RES_ACID,
579 drain => 107, 826 drain => CS_STAT_RES_DRAIN,
580 ghit => 108, 827 ghit => CS_STAT_RES_GHOSTHIT,
581 pois => 109, 828 pois => CS_STAT_RES_POISON,
582 slow => 110, 829 slow => CS_STAT_RES_SLOW,
583 para => 111, 830 para => CS_STAT_RES_PARA,
584 tund => 112, 831 tund => CS_STAT_TURN_UNDEAD,
585 fear => 113, 832 fear => CS_STAT_RES_FEAR,
586 depl => 113, 833 depl => CS_STAT_RES_DEPLETE,
587 deat => 115, 834 deat => CS_STAT_RES_DEATH,
588 holyw => 116, 835 holyw => CS_STAT_RES_HOLYWORD,
589 blind => 117 836 blind => CS_STAT_RES_BLIND,
590 ); 837 );
591 838
592 for (keys %tbl) {
593 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
594 } 840 for keys %tbl;
595
596}
597
598sub metaserver_dialog {
599 my $dialog = new CFClient::UI::FancyFrame
600 title => "Server List",
601 child => (my $vbox = new CFClient::UI::VBox);
602
603 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
604
605 $dialog
606} 841}
607 842
608my $METASERVER_ATIME; 843my $METASERVER_ATIME;
609 844
610sub update_metaserver { 845sub update_metaserver {
611 my ($HOST) = @_;
612
613 return if $METASERVER_ATIME > time; 846 return if $METASERVER_ATIME > time;
614 $METASERVER_ATIME = time + 60; 847 $METASERVER_ATIME = time + 60;
615 848
616 my $table = $METASERVER->{table}; 849 my $table = $METASERVER->{table};
617 $table->clear; 850 $table->clear;
… …
638 871
639 utf8::decode $buf if utf8::valid $buf; 872 utf8::decode $buf if utf8::valid $buf;
640 873
641 $table->clear; 874 $table->clear;
642 875
876 my @tip = (
877 "The current number of users logged in on the server.",
878 "The hostname of the server.",
879 "The time this server has been running without being restarted.",
880 "The server software version - a '+' indicates a Crossfire+ server.",
881 "Short information about this server provided by its admins.",
882 );
643 my @col = qw(Use #Users Host Uptime Version Description); 883 my @col = qw(#Users Host Uptime Version Description);
644 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 884 $table->add ($_, 0, new CFClient::UI::Label
885 can_hover => 1, can_events => 1,
886 align => 0, fg => [1, 1, 0],
887 text => $col[$_], tooltip => $tip[$_])
645 for 0 .. $#col; 888 for 0 .. $#col;
646 889
647 my @align = qw(1 0 1 1 -1); 890 my @align = qw(1 0 1 1 -1);
648 891
649 my $y = 0; 892 my $y = 0;
650 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 893 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
667 910
668 $m = [$users, $host, $uptime, $version, $desc]; 911 $m = [$users, $host, $uptime, $version, $desc];
669 912
670 $y++; 913 $y++;
671 914
672 $table->add (0, $y, new CFClient::UI::VBox children => [ 915 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
673 (new CFClient::UI::Button text => "Use", connect_activate => sub { 916 (new CFClient::UI::Button
917 text => "Use",
918 tooltip => "Put this server into the <b>Host:Port</b> field",
919 on_activate => sub {
674 $HOST->set_text ($CFG->{host} = $host); 920 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
921 $METASERVER->hide;
922 0
923 },
675 }), 924 ),
676 (new CFClient::UI::Empty expand => 1), 925 (new CFClient::UI::Empty expand => 1),
677 ]); 926 ]);
678 927
679 $table->add ($_ + 1, $y, new CFClient::UI::Label 928 $table->add ($_, $y, new CFClient::UI::Label
680 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 929 ellipsise => 0,
930 align => $align[$_],
931 text => $m->[$_],
932 tooltip => $tip[$_],
933 can_hover => 1,
934 can_events => 1,
935 fontsize => 0.8)
681 for 0 .. $#$m; 936 for 0 .. $#$m;
682 } 937 }
683 } 938 }
684 }); 939 });
685} 940}
686 941
942sub metaserver_dialog {
943 my $dialog = new CFClient::UI::FancyFrame
944 title => "Server List",
945 name => 'metaserver_dialog',
946 x => 'center',
947 y => 'center',
948 z => 3,
949 force_h => $::HEIGHT * 0.4,
950 child => (my $vbox = new CFClient::UI::VBox),
951 on_visibility_change => sub {
952 update_metaserver if $_[1];
953 0
954 },
955 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960
961 $dialog
962}
963
687sub server_setup { 964sub server_setup {
688 my $dialog = new CFClient::UI::FancyFrame
689 title => "Server Setup",
690 child => (my $vbox = new CFClient::UI::VBox); 965 my $vbox = new CFClient::UI::VBox;
691 966
692 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 967 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
693 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 968 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
694 969
695 { 970 {
696 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
697 972
698 $vbox->add ( 973 $vbox->add (
699 my $HOST = new CFClient::UI::Entry 974 $HOST_ENTRY = new CFClient::UI::Entry
700 expand => 1, 975 expand => 1,
701 text => $CFG->{host}, 976 text => $CFG->{profile}{default}{host},
702 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
703 connect_changed => sub { 978 on_changed => sub {
704 my ($self, $value) = @_; 979 my ($self, $value) = @_;
705 $CFG->{host} = $value; 980 $CFG->{profile}{default}{host} = $value;
981 0
706 } 982 }
707 ); 983 );
708 984
709 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
710 986
711 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
712 expand => 1, 988 expand => 1,
713 text => "Server List", 989 text => "Server List",
714 other => $METASERVER, 990 other => $METASERVER,
715 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
716 connect_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility; 0 },
717 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
718 }
719 ); 994 );
720 } 995 }
721 996
722 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
723 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
724 text => $CFG->{user}, 999 text => $CFG->{profile}{default}{user},
725 tooltip => "The name of your character on the server", 1000 tooltip => "The name of your character on the server",
726 connect_changed => sub { 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
727 my ($self, $value) = @_;
728 $CFG->{user} = $value;
729 }
730 ); 1002 );
731 1003
732 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1004 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
733 $table->add (1, 5, new CFClient::UI::Entry 1005 $table->add (1, 5, new CFClient::UI::Entry
734 text => $CFG->{password}, 1006 text => $CFG->{profile}{default}{password},
735 hidden => 1, 1007 hidden => 1,
736 tooltip => "The password for your character", 1008 tooltip => "The password for your character",
737 connect_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
738 my ($self, $value) = @_;
739 $CFG->{password} = $value;
740 }
741 ); 1010 );
742 1011
743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1012 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
744 $table->add (1, 7, new CFClient::UI::Slider 1013 $table->add (1, 7, new CFClient::UI::Slider
745 req_w => 100, 1014 force_w => 100,
746 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1015 range => [$CFG->{mapsize}, 10, 100, 0, 1],
747 tooltip => "This is the size of the portion of the map update the server sends you. " 1016 tooltip => "This is the size of the portion of the map update the server sends you. "
748 . "If you set this to a high value you will be able to see further, " 1017 . "If you set this to a high value you will be able to see further, "
749 . "but you also increase bandwidth requirements and latency. " 1018 . "but you also increase bandwidth requirements and latency. "
750 . "This option is only used once at log-in.", 1019 . "This option is only used once at log-in.",
751 connect_changed => sub { 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
752 my ($self, $value) = @_;
753
754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
755 },
756 ); 1021 );
757 1022
758 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1023 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
759 $table->add (1, 8, new CFClient::UI::CheckBox 1024 $table->add (1, 8, new CFClient::UI::CheckBox
760 state => $CFG->{face_prefetch}, 1025 state => $CFG->{face_prefetch},
… …
763 . "This might increase or create lag, but increases the chances " 1028 . "This might increase or create lag, but increases the chances "
764 . "of faces being ready for display when you encounter them. " 1029 . "of faces being ready for display when you encounter them. "
765 . "It also uses up server bandwidth on every connect, " 1030 . "It also uses up server bandwidth on every connect, "
766 . "so only set it if you really need to prefetch images. " 1031 . "so only set it if you really need to prefetch images. "
767 . "This option can be set and unset any time.", 1032 . "This option can be set and unset any time.",
768 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1033 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
769 ); 1034 );
770 1035
771 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1036 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
772 $table->add (1, 9, new CFClient::UI::Entry 1037 $table->add (1, 9, new CFClient::UI::Entry
773 text => $CFG->{output_count}, 1038 text => $CFG->{output_count},
774 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1039 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
775 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1040 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
776 ); 1041 );
777 1042
778 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1043 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
779 $table->add (1, 10, new CFClient::UI::Entry 1044 $table->add (1, 10, new CFClient::UI::Entry
780 text => $CFG->{output_sync}, 1045 text => $CFG->{output_sync},
781 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1046 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
782 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1047 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
783 ); 1048 );
784 1049
785 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1050 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
786 expand => 1, 1051 expand => 1,
787 align => 0, 1052 align => 0,
788 text => "Login", 1053 text => "Login",
789 connect_activate => sub { 1054 on_activate => sub {
790 $CONN ? stop_game 1055 $CONN ? stop_game
791 : start_game; 1056 : start_game;
1057 0
792 }, 1058 },
793 ); 1059 );
794 1060
795 $dialog 1061 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1062 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1063 text => $CFG->{say_command},
1064 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. "
1065 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1066 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1067 on_changed => sub {
1068 my ($self, $value) = @_;
1069 $CFG->{say_command} = $value;
1070 0
1071 }
1072 );
1073
1074 $vbox->add (new CFClient::UI::Label
1075 text => "Server Info",
1076 fontsize => 1.2,
1077 padding_y => 8,
1078 fg => [1, 1, 0, 1],
1079 );
1080
1081 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1082
1083 $vbox
796} 1084}
797 1085
798sub message_window { 1086sub message_window {
799 my $window = new CFClient::UI::FancyFrame 1087 my $window = new CFClient::UI::FancyFrame
1088 name => "message_window",
800 title => "Messages", 1089 title => "Messages",
801 border_bg => [1, 1, 1, 1], 1090 border_bg => [1, 1, 1, 1],
802 bg => [0, 0, 0, 0.75], 1091 bg => [0, 0, 0, 0.75],
803 user_w => int $::WIDTH / 3, 1092 x => "max",
1093 y => 0,
1094 force_w => $::WIDTH * 0.4,
804 user_h => int $::HEIGHT / 5, 1095 force_h => $::HEIGHT * 0.5,
805 child => (my $vbox = new CFClient::UI::VBox); 1096 child => (my $vbox = new CFClient::UI::VBox),
1097 has_close_button => 1;
806 1098
807 $vbox->add ($LOGVIEW); 1099 $vbox->add ($LOGVIEW);
808 1100
809 $vbox->add (my $input = new CFClient::UI::Entry 1101 $vbox->add (my $input = new CFClient::UI::Entry
810 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1102 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
811 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1103 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
812 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1104 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
813 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1105 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
814 connect_focus_in => sub { 1106 on_focus_in => sub {
815 my ($input, $prev_focus) = @_; 1107 my ($input, $prev_focus) = @_;
816 1108
817 delete $input->{refocus_map}; 1109 delete $input->{refocus_map};
818 1110
819 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1111 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
820 $input->{refocus_map} = 1; 1112 $input->{refocus_map} = 1;
821 } 1113 }
822 delete $input->{auto_activated}; 1114 delete $input->{auto_activated};
1115
1116 0
823 }, 1117 },
824 connect_activate => sub { 1118 on_activate => sub {
825 my ($input, $text) = @_; 1119 my ($input, $text) = @_;
826 $input->set_text (''); 1120 $input->set_text ('');
827 1121
828 if ($text =~ /^\/(.*)/) { 1122 if ($text =~ /^\/(.*)/) {
829 $::CONN->user_send ($1); 1123 $::CONN->user_send ($1);
… …
833 } 1127 }
834 if ($input->{refocus_map}) { 1128 if ($input->{refocus_map}) {
835 delete $input->{refocus_map}; 1129 delete $input->{refocus_map};
836 $MAPWIDGET->focus_in 1130 $MAPWIDGET->focus_in
837 } 1131 }
1132
1133 0
838 }, 1134 },
839 connect_escape => sub { 1135 on_escape => sub {
840 $MAPWIDGET->focus_in 1136 $MAPWIDGET->grab_focus;
1137
1138 0
841 }, 1139 },
842 ); 1140 );
843 1141
844 $CONSOLE = { 1142 $CONSOLE = {
845 window => $window, 1143 window => $window,
846 input => $input 1144 input => $input,
847 }; 1145 };
848 1146
849 $window 1147 $window
850} 1148}
851 1149
852sub open_quit_dialog { 1150sub open_quit_dialog {
853 unless ($QUIT_DIALOG) { 1151 unless ($QUIT_DIALOG) {
854
855 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1152 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1153 x => "center",
1154 y => "center",
1155 z => 50,
1156 title => "Really Quit?",
1157 ;
856 1158
857 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1159 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
858 1160
859 $vb->add (new CFClient::UI::Label 1161 $vb->add (new CFClient::UI::Label
860 text => "You should find a savebed and apply it first!", 1162 text => "You should find a savebed and apply it first!",
… …
863 ); 1165 );
864 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1166 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
865 $hb->add (new CFClient::UI::Button 1167 $hb->add (new CFClient::UI::Button
866 text => "Ok", 1168 text => "Ok",
867 expand => 1, 1169 expand => 1,
868 connect_activate => sub { $QUIT_DIALOG->hide }, 1170 on_activate => sub { $QUIT_DIALOG->hide; 0 },
869 ); 1171 );
870 $hb->add (new CFClient::UI::Button 1172 $hb->add (new CFClient::UI::Button
871 text => "Quit anyway", 1173 text => "Quit anyway",
872 expand => 1, 1174 expand => 1,
873 connect_activate => sub { exit }, 1175 on_activate => sub { exit },
874 );
875
876 $QUIT_DIALOG->show_centered;
877 } else {
878 $QUIT_DIALOG->show_centered;
879 }
880}
881
882sub make_inventory_window {
883 my $invwin = new CFClient::UI::FancyFrame
884 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
885
886 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
887
888 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
889 $vb1->add (my $lbl = new CFClient::UI::Label);
890 $lbl->set_text ("Player");
891 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
892
893 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
894 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
895 $INVR_LBL->set_text ("Floor");
896 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
897
898 $invwin
899}
900
901sub make_help_window {
902 my $win = new CFClient::UI::FancyFrame
903 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
904
905 $win->add (my $vbox = new CFClient::UI::VBox);
906
907 $vbox->add (my $buttons = new CFClient::UI::HBox);
908 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
909
910 for (
911 [intro => "Introduction"],
912 [manual => "Manual"],
913 [command_help => "Commands"],
914 [skill_help => "Skills"],
915 ) {
916 my ($pod, $label) = @$_;
917
918 $buttons->add (new CFClient::UI::Button
919 text => $label,
920 connect_activate => sub {
921 my $parser = new Pod::POM;
922 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
923
924 $viewer->clear;
925
926 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
927 for @{ CFClient::pod_to_pango_list $pom };
928
929 $viewer->set_offset (0);
930 },
931 ); 1176 );
932 } 1177 }
933 1178
934 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1179 $QUIT_DIALOG->show;
1180}
1181
1182sub autopickup_setup {
1183 my $table = new CFClient::UI::Table;
1184
1185 for (
1186 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG],
1191 ],
1192 ["Weapons", 0, 6,
1193 ["All weapons" => PICKUP_ALLWEAPON],
1194 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1195 ["Bows" => PICKUP_BOW],
1196 ["Arrows" => PICKUP_ARROW],
1197 ],
1198 ["Armour", 0, 12,
1199 ["Helmets" => PICKUP_HELMET],
1200 ["Shields" => PICKUP_SHIELD],
1201 ["Body Armour" => PICKUP_ARMOUR],
1202 ["Boots" => PICKUP_BOOTS],
1203 ["Gloves" => PICKUP_GLOVES],
1204 ["Cloaks" => PICKUP_CLOAK],
1205 ],
1206
1207 ["Readables", 2, 2,
1208 ["Spellbooks" => PICKUP_SPELLBOOK],
1209 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1210 ["Normal Books/Scrolls" => PICKUP_READABLES],
1211 ],
1212 ["Misc", 2, 7,
1213 ["Food" => PICKUP_FOOD],
1214 ["Drinks" => PICKUP_DRINK],
1215 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1216 ["Keys" => PICKUP_KEY],
1217 ["Magical Items" => PICKUP_MAGICAL],
1218 ["Potions" => PICKUP_POTION],
1219 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1220 ["Ignore cursed" => PICKUP_NOT_CURSED],
1221 ["Jewelery" => PICKUP_JEWELS],
1222 ],
1223 ["Weight/Value ratio", 2, 17]
1224 )
1225 {
1226 my ($title, $x, $y, @bits) = @$_;
1227 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1228
1229 for (@bits) {
1230 ++$y;
1231
1232 my $mask = $_->[1];
1233 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1234 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1235 state => $CFG->{pickup} & $mask,
1236 on_changed => sub {
1237 my ($box, $value) = @_;
1238
1239 if ($value) {
1240 $::CFG->{pickup} |= $mask;
1241 } else {
1242 $::CFG->{pickup} &= ~$mask;
1243 }
1244
1245 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN;
1247
1248 0
1249 });
1250 }
1251 }
1252
1253 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1],
1255 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub {
1257 my ($slider, $value) = @_;
1258
1259 $::CFG->{pickup} &= ~0x7;
1260 $::CFG->{pickup} |= int $value
1261 if $value;
1262 1;
1263 });
1264 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set",
1266 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN;
1269 0
1270 });
1271
1272 $table
1273}
1274
1275sub inventory_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center",
1278 y => "center",
1279 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10,
1281 title => "Inventory",
1282 has_close_button => 1,
1283 ;
1284
1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1286
1287 $hb->add (my $vb1 = new CFClient::UI::VBox);
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1289 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1290
1291 $hb->add (my $vb2 = new CFClient::UI::VBox);
1292
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1294
1295 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1296
1297 # XXX: Call after $INVR = ... because set_opencont sets the items
1298 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1299
1300 $invwin
1301}
1302
1303sub spell_setup {
1304 new CFClient::UI::SpellList
1305}
1306
1307sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309}
1310
1311sub keyboard_setup {
1312 my $binding_list = new CFClient::UI::VBox;
1313
1314 my $refresh;
1315 $refresh = $BIND_UPD_CB = sub {
1316 $binding_list->clear ();
1317
1318 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1322
1323 my $lbl = join "; ", @$cmds;
1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1325 $binding_list->add (my $hb = new CFClient::UI::HBox);
1326 $hb->add (new CFClient::UI::Button
1327 text => "delete",
1328 tooltip => "Deletes the binding",
1329 on_activate => sub {
1330 $binding_list->remove ($hb);
1331 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1332 0
1333 });
1334
1335 $hb->add (new CFClient::UI::Button
1336 text => "edit",
1337 tooltip => "Edits the binding",
1338 on_activate => sub {
1339 $::BIND_EDITOR->set_binding (
1340 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1341 sub {
1342 my ($nmod, $nsym, $ncmds) = @_;
1343 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1344 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1345 $refresh->();
1346 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1347 $SETUP_DIALOG->show;
1348 },
1349 sub {
1350 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1351 $SETUP_DIALOG->show;
1352 });
1353 $::BIND_EDITOR->show;
1354 $SETUP_DIALOG->hide;
1355 0
1356 });
1357
1358 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1359 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1360 }
1361 }
1362 };
1363
1364 my $vb = new CFClient::UI::VBox;
1365 $vb->add (my $hb = new CFClient::UI::HBox);
1366 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1367 $hb->add (new CFClient::UI::CheckBox
1368 expand => 1,
1369 state => $CFG->{shift_fire_stop},
1370 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1371 on_changed => sub {
1372 my ($cbox, $value) = @_;
1373 $CFG->{shift_fire_stop} = $value;
1374 0
1375 });
1376
1377 $vb->add ($binding_list);
1378 $vb->add (my $hb = new CFClient::UI::HBox);
1379
1380 $hb->add (new CFClient::UI::Button
1381 text => "record new",
1382 expand => 1,
1383 tooltip => "This button opens the binding editor with an empty binding.",
1384 on_activate => sub {
1385 $::BIND_EDITOR->set_binding (undef, undef, [],
1386 sub {
1387 my ($mod, $sym, $cmds) = @_;
1388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1389 $refresh->();
1390 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1391 $SETUP_DIALOG->show;
1392 },
1393 sub {
1394 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1395 $SETUP_DIALOG->show;
1396 },
1397 );
1398 $SETUP_DIALOG->hide;
1399 $::BIND_EDITOR->show;
1400 0
1401 },
1402 );
1403
1404 $hb->add (new CFClient::UI::Button
1405 text => "close",
1406 tooltip => "Closes the binding window",
1407 expand => 1,
1408 on_activate => sub {
1409 $SETUP_DIALOG->hide;
1410 0
1411 }
1412 );
1413
1414 $refresh->();
1415
1416 $vb
1417}
1418
1419sub help_window {
1420 my $win = new CFClient::UI::FancyFrame
1421 x => 'center',
1422 y => 'center',
1423 z => 2,
1424 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation";
1428
1429 $win->add (my $vbox = new CFClient::UI::VBox);
1430
1431 $vbox->add (my $buttons = new CFClient::UI::HBox);
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1433 expand => 1, fontsize => 0.8, padding_x => 4);
1434
1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1436 $buttons->add (my $combo = new CFClient::UI::Combobox
1437 value => undef,
1438 options => [
1439 [intro => "Introduction"],
1440 [manual => "Main Manual"],
1441 [skill_help => "Skill Reference"],
1442 [command_help => "Command Reference"],
1443 [dmcommand_help => "DM Commands"],
1444 [COPYING => "License Terms"],
1445 ],
1446 on_changed => sub {
1447 my ($self, $pod) = @_;
1448
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1451
1452 $viewer->clear;
1453
1454# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1455# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1456# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1457# ]);#d#
1458
1459 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1460 for @$pom;
1461
1462 $viewer->set_offset (0);
1463
1464 0
1465 },
1466 on_visibility_change => sub {
1467 my ($self, $visible) = @_;
1468 return unless $visible;
1469 return if $self->{value};
1470 $self->set_value ("intro");
1471 0
1472 },
1473 );
935 1474
936 $win 1475 $win
937} 1476}
938 1477
939sub sdl_init { 1478sub sdl_init {
… …
956 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1495 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
957 1496
958 $SDL_ACTIVE = 1; 1497 $SDL_ACTIVE = 1;
959 $LAST_REFRESH = time - 0.01; 1498 $LAST_REFRESH = time - 0.01;
960 1499
961 CFClient::gl_init; 1500 CFClient::OpenGL::init;
962 1501
963 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1502 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
964 1503
965 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1504 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
966 1505
… …
969 if ($DEBUG_STATUS) { 1508 if ($DEBUG_STATUS) {
970 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1509 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
971 } else { 1510 } else {
972 # create the widgets 1511 # create the widgets
973 1512
974 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1513 $DEBUG_STATUS = new CFClient::UI::Label
1514 padding => 0,
1515 z => 100,
1516 force_x => "max",
1517 force_y => 0;
975 $DEBUG_STATUS->show; 1518 $DEBUG_STATUS->show;
976 1519
1520 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1521
977 $STATUSBOX = new CFClient::UI::Statusbox; 1522 $STATUSBOX = new CFClient::UI::Statusbox;
978 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1523 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
979 1524
980 (new CFClient::UI::Frame 1525 (new CFClient::UI::Frame
981 bg => [0, 0, 0, 0.4], 1526 bg => [0, 0, 0, 0.4],
982 req_y => -1, 1527 force_x => 0,
1528 force_y => "max",
983 child => $STATUSBOX, 1529 child => $STATUSBOX,
984 )->show; 1530 )->show;
985 1531
986 CFClient::UI::FancyFrame->new ( 1532 CFClient::UI::FancyFrame->new (
1533 title => "Map",
1534 name => "mapmap",
1535 x => 0,
1536 y => $FONTSIZE + 8,
987 border_bg => [1, 1, 1, 192/255], 1537 border_bg => [1, 1, 1, 192/255],
988 bg => [1, 1, 1, 0], 1538 bg => [1, 1, 1, 0],
989 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1539 child => ($MAPMAP = new CFClient::MapWidget::MapMap
990 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1540 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
991 ), 1541 ),
… …
995 $MAPWIDGET->connect (activate_console => sub { 1545 $MAPWIDGET->connect (activate_console => sub {
996 my ($mapwidget, $preset) = @_; 1546 my ($mapwidget, $preset) = @_;
997 1547
998 if ($CONSOLE) { 1548 if ($CONSOLE) {
999 $CONSOLE->{input}->{auto_activated} = 1; 1549 $CONSOLE->{input}->{auto_activated} = 1;
1000 $CONSOLE->{input}->focus_in; 1550 $CONSOLE->{input}->grab_focus;
1001 1551
1002 if ($preset && $CONSOLE->{input}->get_text eq '') { 1552 if ($preset && $CONSOLE->{input}->get_text eq '') {
1003 $CONSOLE->{input}->set_text ($preset); 1553 $CONSOLE->{input}->set_text ($preset);
1004 } 1554 }
1005 } 1555 }
1006 }); 1556 });
1007 $MAPWIDGET->show; 1557 $MAPWIDGET->show;
1008 $MAPWIDGET->focus_in; 1558 $MAPWIDGET->grab_focus;
1009 1559
1010 $LOGVIEW = new CFClient::UI::TextView 1560 $LOGVIEW = new CFClient::UI::TextScroller
1011 expand => 1, 1561 expand => 1,
1012 font => $FONT_FIXED, 1562 font => $FONT_FIXED,
1013 fontsize => $::CFG->{log_fontsize}, 1563 fontsize => $::CFG->{log_fontsize},
1564 indent => -4,
1014 can_hover => 1, 1565 can_hover => 1,
1015 can_events => 1, 1566 can_events => 1,
1016 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1567 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1017 ; 1568 ;
1018 1569
1019 $BUTTONBAR = new CFClient::UI::HBox; 1570 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1571 title => "Setup",
1572 name => "setup_dialog",
1573 x => 'center',
1574 y => 'center',
1575 z => 2,
1576 force_w => $::WIDTH * 0.6,
1577 force_h => $::HEIGHT * 0.6,
1578 has_close_button => 1,
1579 ;
1020 1580
1581 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1582 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1583
1584 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1585 "Configure the server to play on, your username, password and other server-related options.");
1586 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1587 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1588 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1589 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1590 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1591 "Configure the use of audio, sound effects and background music.");
1592 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1593 "Lets you define, edit and delete key bindings."
1594 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1595 . "with nothing set and the recording started. After doing the actions you "
1596 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1597 . "After pressing the combo the binding will be saved automatically and the "
1598 . "binding editor closes");
1599 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1600 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1601 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1602 "Some debuggin' options. Do not ask.");
1603
1604 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1605
1021 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1606 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1022 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1607 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1023 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1608
1024 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1025 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1609 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1026 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1610 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1027 1611
1028 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 1612 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
1029 1613
1030 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1614 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1031 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1615 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1032 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1033 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1617 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1618 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1034 1619
1035 $BUTTONBAR->add (new CFClient::UI::Button 1620 $BUTTONBAR->add (new CFClient::UI::Button
1036 text => "Save Config", 1621 text => "Save Config",
1037 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1622 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1038 connect_activate => sub { 1623 on_activate => sub {
1624 $::CFG->{layout} = CFClient::UI::get_layout;
1039 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1625 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1040 status "Configuration Saved"; 1626 status "Configuration Saved";
1627 0
1041 }, 1628 },
1042 ); 1629 );
1043 1630
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1631 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1045 tooltip => "View Documentation"); 1632 tooltip => "View Documentation");
1046 1633
1047 $BUTTONBAR->add (new CFClient::UI::Button 1634 $BUTTONBAR->add (new CFClient::UI::Button
1048 text => "Quit", 1635 text => "Quit",
1049 tooltip => "Terminates the program", 1636 tooltip => "Terminates the program",
1050 connect_activate => sub { 1637 on_activate => sub {
1051 if ($CONN) { 1638 if ($CONN) {
1052 open_quit_dialog; 1639 open_quit_dialog;
1053 } else { 1640 } else {
1054 exit; 1641 exit;
1055 } 1642 }
1643 0
1056 }, 1644 },
1057 ); 1645 );
1058 1646
1059 $BUTTONBAR->show; 1647 $BUTTONBAR->show;
1060 1648 $SETUP_DIALOG->show;
1061 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1062
1063 # delay till geometry is constant
1064 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1065 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1066 my $widget = $GAUGES->{win};
1067 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1068 });
1069 force_refresh ();
1070 } 1649 }
1650
1651 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1071} 1652}
1072 1653
1073sub video_shutdown { 1654sub video_shutdown {
1655 CFClient::OpenGL::shutdown;
1656
1074 undef $SDL_ACTIVE; 1657 undef $SDL_ACTIVE;
1075} 1658}
1076 1659
1077my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1660my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1078my $bgmusic;#TODO#hack#d# 1661my $bgmusic;#TODO#hack#d#
… …
1142 1725
1143my %demo;#d# 1726my %demo;#d#
1144 1727
1145sub force_refresh { 1728sub force_refresh {
1146 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1729 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1147 debug sprintf "%3.2f", $fps; 1730 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1148 1731
1149 $CFClient::UI::ROOT->draw; 1732 $CFClient::UI::ROOT->draw;
1150 1733
1151 $WANT_REFRESH = 0; 1734 $WANT_REFRESH = 0;
1152 $CAN_REFRESH = 0; 1735 $CAN_REFRESH = 0;
… …
1207}; 1790};
1208 1791
1209 CFClient::SDL_GL_SwapBuffers; 1792 CFClient::SDL_GL_SwapBuffers;
1210} 1793}
1211 1794
1212my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1795my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1213 $NOW = time; 1796 $NOW = time;
1214 1797
1215 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1798 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1216 for CFClient::SDL_PollEvent; 1799 for CFClient::SDL_PollEvent;
1217 1800
… …
1235sub animation_stop { 1818sub animation_stop {
1236 my ($widget) = @_; 1819 my ($widget) = @_;
1237 delete $animate_object{$widget}; 1820 delete $animate_object{$widget};
1238} 1821}
1239 1822
1240@conn::ISA = Crossfire::Protocol::;
1241
1242sub conn::new {
1243 my $class = shift;
1244
1245 my $self = $class->Crossfire::Protocol::new (@_);
1246
1247 $MAPWIDGET->clr_commands;
1248
1249 my $parser = new Pod::POM;
1250 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1251
1252 for my $head2 ($pod->head2) {
1253 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1254 or next;
1255
1256 my $cmd = $1;
1257 my @args = split /\|/, $2;
1258 @args = (".*") unless @args;
1259
1260 my $text = CFClient::pod_to_pango $head2->content;
1261
1262 for my $arg (@args) {
1263 $arg = $arg eq ".*" ? "" : " $arg";
1264
1265 $MAPWIDGET->add_command ("$cmd$arg", $text);
1266 }
1267 }
1268
1269 $self->{noface} = new_from_file CFClient::Texture
1270 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1271
1272 $self
1273}
1274
1275sub conn::stats_update {
1276 my ($self, $stats) = @_;
1277
1278 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1279 my $diff = $exp - $self->{prev_exp};
1280 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1281 if exists $self->{prev_exp} && $diff;
1282 $self->{prev_exp} = $exp;
1283 }
1284
1285 update_stats_window ($stats);
1286}
1287
1288sub conn::user_send {
1289 my ($self, $command) = @_;
1290
1291 $self->send_command ($command);
1292 status $command;
1293}
1294
1295sub conn::map_scroll {
1296 my ($self, $dx, $dy) = @_;
1297
1298 $MAP->scroll ($dx, $dy);
1299}
1300
1301sub conn::feed_map1a {
1302 my ($self, $data) = @_;
1303
1304# $self->Crossfire::Protocol::feed_map1a ($data);
1305
1306 $MAP->map1a_update ($data);
1307 $MAPWIDGET->update;
1308}
1309
1310sub conn::flush_map {
1311 my ($self) = @_;
1312
1313 my $map_info = delete $self->{map_info}
1314 or return;
1315
1316 my ($hash, $x, $y, $w, $h) = @$map_info;
1317
1318 my $data = $MAP->get_rect ($x, $y, $w, $h);
1319 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1320 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1321}
1322
1323sub conn::map_clear {
1324 my ($self) = @_;
1325
1326 $self->flush_map;
1327 delete $self->{neigh_map};
1328
1329 $MAP->clear;
1330}
1331
1332
1333sub conn::load_map($$$) {
1334 my ($self, $hash, $x, $y) = @_;
1335
1336 if (defined (my $data = $MAPCACHE->get ($hash))) {
1337 $data = Compress::LZF::decompress $data;
1338 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1339 for my $id ($MAP->set_rect ($x, $y, $data)) {
1340 my $data = $TILECACHE->get ($id)
1341 or next;
1342
1343 $self->set_texture ($id => $data);
1344 }
1345 }
1346}
1347
1348# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1349# (server resource,s latency, bandwidth), so this hack is warranted.
1350# the right fix is to make real tiled maps with an overview file
1351sub conn::send_mapinfo {
1352 my ($self, $data, $cb) = @_;
1353
1354 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1355 my ($wx, $wy) = ($1, $2);
1356
1357 if ($data =~ /^spatial ([1-4]+)$/) {
1358 my @dx = (0, 0, 1, 0, -1);
1359 my @dy = (0, -1, 0, 1, 0);
1360 my ($dx, $dy);
1361
1362 for (split //, $1) {
1363 $dx += $dx[$_];
1364 $dy += $dy[$_];
1365 }
1366
1367 $cb->(spatial => 15,
1368 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1369 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1370 50, 50,
1371 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1372 );
1373
1374 return;
1375 }
1376 }
1377
1378 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1379}
1380
1381# this method does a "flood fill" into every tile direction
1382# it assumes that tiles are arranged in a rectangular grid,
1383# i.e. a map is the same as the left of the right map etc.
1384# failure to comply are harmless and result in display errors
1385# at worst.
1386sub conn::flood_fill {
1387 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1388
1389 # the server does not allow map paths > 6
1390 return if 7 <= length $path;
1391
1392 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1393
1394 for (
1395 [1, 3, 0, -1],
1396 [2, 4, 1, 0],
1397 [3, 1, 0, 1],
1398 [4, 2, -1, 0],
1399 ) {
1400 my ($tile, $tile2, $dx, $dy) = @$_;
1401
1402 next if $block & (1 << $tile);
1403 my $block = $block | (1 << $tile2);
1404
1405 my $gx = $gx + $dx;
1406 my $gy = $gy + $dy;
1407
1408 next unless $flags & (1 << ($tile - 1));
1409 next if $self->{neigh_grid}{$gx, $gy}++;
1410
1411 my $neigh = $self->{neigh_map}{$hash} ||= [];
1412 if (my $info = $neigh->[$tile]) {
1413 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1414
1415 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1416 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1417
1418 } else {
1419 $self->send_mapinfo ("spatial $path$tile", sub {
1420 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1421
1422 return if $mode ne "spatial";
1423
1424 $x += $MAP->ox;
1425 $y += $MAP->oy;
1426
1427 $self->load_map ($hash, $x, $y)
1428 unless $self->{neigh_map}{$hash}[5]++;#d#
1429
1430 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1431
1432 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1433 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1434 });
1435 }
1436 }
1437}
1438
1439sub conn::map_change {
1440 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1441
1442 $self->flush_map;
1443
1444 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1445
1446 my $mapmapw = $MAPMAP->{w};
1447 my $mapmaph = $MAPMAP->{h};
1448
1449 $self->{neigh_rect} = [
1450 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1451 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1452 ];
1453
1454 delete $self->{neigh_grid};
1455
1456 $x += $ox;
1457 $y += $oy;
1458
1459 $self->{map_info} = [$hash, $x, $y, $w, $h];
1460
1461 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1462 $STATWIDS->{map}->set_text ("Map: " . $map);
1463
1464 $self->load_map ($hash, $x, $y);
1465 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1466}
1467
1468sub conn::face_find {
1469 my ($self, $facenum, $face) = @_;
1470
1471 my $hash = "$face->{chksum},$face->{name}";
1472
1473 my $id = $FACEMAP->get ($hash);
1474
1475 unless ($id) {
1476 # create new id for face
1477 # I love transactions
1478 for (1..100) {
1479 my $txn = $CFClient::DB_ENV->txn_begin;
1480 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1481 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1482 $id = ($id || 16) + 1;
1483 if ($FACEMAP->put (id => $id) == 0
1484 && $FACEMAP->put ($hash => $id) == 0) {
1485 $txn->txn_commit;
1486
1487 goto gotid;
1488 }
1489 }
1490 $txn->abort;
1491 }
1492
1493 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1494 }
1495
1496gotid:
1497 $face->{id} = $id;
1498 $MAP->set_face ($facenum => $id);
1499 $self->{faceid}[$facenum] = $id;#d#
1500
1501 my $face = $TILECACHE->get ($id);
1502
1503 if ($face) {
1504 #$self->face_prefetch;
1505 $face
1506 } else {
1507 my $tex = $self->{noface};
1508 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1509 undef
1510 };
1511}
1512
1513sub conn::face_update {
1514 my ($self, $facenum, $face) = @_;
1515
1516 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1517
1518 $self->set_texture ($face->{id} => delete $face->{image});
1519}
1520
1521sub conn::set_texture {
1522 my ($self, $id, $data) = @_;
1523
1524 $self->{texture}[$id] ||= do {
1525 my $tex =
1526 new_from_image CFClient::Texture
1527 $data, minify => 1, mipmap => 1;
1528
1529 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1530 $MAPWIDGET->update;
1531
1532 $tex
1533 };
1534}
1535
1536sub conn::sound_play {
1537 my ($self, $x, $y, $soundnum, $type) = @_;
1538
1539 $SDL_MIXER
1540 or return;
1541
1542 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1543 or return;
1544
1545 $chunk->play;
1546# warn "sound $x,$y,$soundnum,$type\n";#d#
1547}
1548
1549my $LAST_QUERY; # server is stupid, stupid, stupid
1550
1551sub conn::query {
1552 my ($self, $flags, $prompt) = @_;
1553
1554 $prompt = $LAST_QUERY unless length $prompt;
1555 $LAST_QUERY = $prompt;
1556
1557 my $dialog = new CFClient::UI::FancyFrame
1558 title => "Query",
1559 child => my $vbox = new CFClient::UI::VBox;
1560
1561 $vbox->add (new CFClient::UI::Label
1562 max_w => $::WIDTH * 0.4,
1563 ellipsise => 0,
1564 text => $prompt);
1565
1566 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1567 $vbox->add (my $hbox = new CFClient::HBox);
1568 $hbox->add (new CFClient::Button
1569 text => "No",
1570 connect_activate => sub {
1571 $self->send ("reply n");
1572 $dialog->destroy;
1573 $MAPWIDGET->focus_in;
1574 }
1575 );
1576 $hbox->add (new CFClient::Button
1577 text => "Yes",
1578 connect_activate => sub {
1579 $self->send ("reply y");
1580 $dialog->destroy;
1581 },
1582 );
1583
1584 $dialog->focus_in;
1585
1586 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1587 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1588 $vbox->add (my $entry = new CFClient::UI::Entry
1589 connect_changed => sub {
1590 $self->send ("reply $_[1]");
1591 $dialog->destroy;
1592 },
1593 );
1594
1595 $entry->focus_in;
1596
1597 } else {
1598 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1599
1600 $vbox->add (my $entry = new CFClient::UI::Entry
1601 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1602 connect_activate => sub {
1603 $self->send ("reply $_[1]");
1604 $dialog->destroy;
1605 },
1606 );
1607
1608 $entry->focus_in;
1609 }
1610
1611 $dialog->show_centered;
1612}
1613
1614sub conn::drawinfo {
1615 my ($self, $color, $text) = @_;
1616
1617 my @color = (
1618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1619 [1.00, 1.00, 1.00],
1620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1621 [1.00, 0.00, 0.00],
1622 [1.00, 0.54, 0.00],
1623 [0.11, 0.56, 1.00],
1624 [0.93, 0.46, 0.00],
1625 [0.18, 0.54, 0.34],
1626 [0.56, 0.73, 0.56],
1627 [0.80, 0.80, 0.80],
1628 [0.55, 0.41, 0.13],
1629 [0.99, 0.77, 0.26],
1630 [0.74, 0.65, 0.41],
1631 );
1632
1633 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1634
1635 $text = CFClient::UI::Label::escape $text;
1636 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1637 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1638
1639 $LOGVIEW->add_paragraph ($color[$color],
1640 join "\n", map "$time $_", split /\n/, $text);
1641
1642 $STATUSBOX->add ($text,
1643 group => $text,
1644 fg => $color[$color],
1645 timeout => 10,
1646 tooltip_font => $::FONT_FIXED,
1647 );
1648}
1649
1650sub conn::drawextinfo {
1651 my ($self, $color, $type, $subtype, $message) = @_;
1652
1653 $self->drawinfo ($color, $message);
1654}
1655
1656sub conn::spell_add {
1657 my ($self, $spell) = @_;
1658
1659 # TODO
1660 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1661 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1662 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1663}
1664
1665sub conn::spell_delete {
1666 my ($self, $spell) = @_;
1667}
1668
1669sub conn::addme_success {
1670 my ($self) = @_;
1671
1672 $self->send ("command output-sync $CFG->{output_sync}");
1673 $self->send ("command output-count $CFG->{output_count}");
1674
1675 my $parser = new Pod::POM;
1676 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1677
1678 my %skill_tooltip;
1679
1680 for my $head2 ($pod->head2) {
1681 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1682 }
1683
1684 for my $skill (values %{$self->{skill_info}}) {
1685 $MAPWIDGET->add_command ("ready_skill $skill",
1686 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1687 . $skill_tooltip{$skill});
1688 $MAPWIDGET->add_command ("use_skill $skill",
1689 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1690 . $skill_tooltip{$skill});
1691 }
1692}
1693
1694sub conn::eof {
1695 $MAPWIDGET->clr_commands;
1696
1697 stop_game;
1698}
1699
1700sub conn::image_info {
1701 my ($self, $numfaces) = @_;
1702
1703 $self->{num_faces} = $numfaces;
1704 $self->{face_prefetch} = [1 .. $numfaces];
1705 $self->face_prefetch;
1706}
1707
1708sub conn::face_prefetch {
1709 my ($self) = @_;
1710
1711 return unless $CFG->{face_prefetch};
1712
1713 if ($self->{num_faces}) {
1714 return if @{ $self->{send_queue} || [] };
1715 my $todo = @{ $self->{face_prefetch} }
1716 or return;
1717
1718 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1719
1720 $self->send ("requestinfo image_sums $face $face");
1721
1722 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1723 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1724 } elsif (!exists $self->{num_faces}) {
1725 $self->send ("requestinfo image_info");
1726
1727 $self->{num_faces} = 0;
1728
1729 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1730 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1731 }
1732}
1733
1734# check once/second for faces that need to be prefetched 1823# check once/second for faces that need to be prefetched
1735# this should, of course, only run on demand, but 1824# this should, of course, only run on demand, but
1736# SDL forces worse things on us.... 1825# SDL forces worse things on us....
1737 1826
1738Event->timer (after => 1, interval => 0.25, cb => sub { 1827Event->timer (after => 1, interval => 0.25, cb => sub {
1739 $CONN->face_prefetch 1828 $CONN->face_prefetch
1740 if $CONN; 1829 if $CONN;
1741}); 1830});
1742
1743sub update_floorbox {
1744 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1745 return unless $CONN;
1746
1747 $FLOORBOX->clear;
1748 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1749
1750 my $count = 7;
1751 for (@{ $CONN->{container}{0} }) {
1752 if (--$count) {
1753 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1754 } else {
1755 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1756 last;
1757 }
1758 }
1759 });
1760
1761 $WANT_REFRESH++;
1762}
1763
1764sub conn::container_add {
1765 my ($self, $tag, $items) = @_;
1766
1767 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1768
1769 if ($tag == 0) {
1770 update_floorbox;
1771 $OPENCONT = 0;
1772 $INVR_LBL->set_text ("Floor");
1773 $INVR->set_items ($self->{container}{0});
1774 } elsif ($tag == $self->{player}{tag}) {
1775 $INVR_LBL->set_text ("Player");
1776 $INV->set_items ($self->{container}{$self->{player}{tag}})
1777 } else {
1778 $OPENCONT = $tag;
1779 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1780 $INVR->set_items ($self->{container}{$tag});
1781 }
1782
1783 # $self-<{player}{tag} => player inv
1784 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1785}
1786
1787sub conn::container_clear {
1788 my ($self, $tag) = @_;
1789
1790 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1791
1792 if ($tag == 0) {
1793 update_floorbox;
1794 $OPENCONT = 0;
1795 $INVR_LBL->set_text ("Floor");
1796 $INVR->set_items ($self->{container}{0});
1797 } elsif ($tag == $self->{player}{tag}) {
1798 $INVR_LBL->set_text ("Player");
1799 $INV->set_items ($self->{container}{$tag})
1800 } else {
1801 $OPENCONT = $tag;
1802 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1803 $INVR->set_items ($self->{container}{$tag});
1804 }
1805
1806# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1807}
1808
1809sub conn::item_delete {
1810 my ($self, @items) = @_;
1811
1812 for (@items) {
1813 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1814
1815 if ($_->{container} == 0) {
1816 update_floorbox;
1817 $OPENCONT = 0;
1818 $INVR_LBL->set_text ("Floor");
1819 $INVR->set_items ($self->{container}{0});
1820 } elsif ($_->{container} == $self->{player}{tag}) {
1821 $INVR_LBL->set_text ("Player");
1822 $INV->set_items ($self->{container}{$self->{player}{tag}})
1823 } else {
1824 $OPENCONT = $_->{container};
1825 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1826 $INVR->set_items ($self->{container}{$_->{container}});
1827 }
1828 }
1829}
1830
1831sub conn::item_update {
1832 my ($self, $item) = @_;
1833
1834 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1835
1836 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1837 $OPENCONT = 0;
1838 $INVR_LBL->set_text ("Floor");
1839 $INVR->set_items ($self->{container}{0});
1840
1841 $item->{widget}->update_item
1842 if $item->{widget};
1843 } else {
1844 if ($item->{container} == 0) {
1845 update_floorbox;
1846 $OPENCONT = 0;
1847 $INVR_LBL->set_text ("Floor");
1848 $INVR->set_items ($self->{container}{0});
1849 } elsif ($item->{container} == $self->{player}{tag}) {
1850 $INV->set_items ($self->{container}{$item->{container}})
1851 }
1852 }
1853}
1854 1831
1855%SDL_CB = ( 1832%SDL_CB = (
1856 CFClient::SDL_QUIT => sub { 1833 CFClient::SDL_QUIT => sub {
1857 Event::unloop -1; 1834 Event::unloop -1;
1858 }, 1835 },
… …
1890############################################################################# 1867#############################################################################
1891 1868
1892$SIG{INT} = $SIG{TERM} = sub { exit }; 1869$SIG{INT} = $SIG{TERM} = sub { exit };
1893 1870
1894{ 1871{
1895 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1872 local $SIG{__DIE__} = sub {
1873 return unless defined $^S && !$^S;
1874 Carp::confess $_[1];#d#TODO: remove when stable
1875 CFClient::fatal $_[0];
1876 };
1896 1877
1897 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1898 1879 CFClient::UI::set_layout ($::CFG->{layout});
1899 $TILECACHE = CFClient::db_table "tilecache";
1900 $FACEMAP = CFClient::db_table "facemap";
1901 1880
1902 my %DEF_CFG = ( 1881 my %DEF_CFG = (
1903 sdl_mode => 0, 1882 sdl_mode => 0,
1904 width => 640, 1883 width => 640,
1905 height => 480, 1884 height => 480,
1906 fullscreen => 0, 1885 fullscreen => 0,
1907 fast => 0, 1886 fast => 0,
1908 map_scale => 1, 1887 map_scale => 1,
1909 fow_enable => 1, 1888 fow_enable => 1,
1910 fow_intensity => 0.45, 1889 fow_intensity => 0.45,
1911 fow_smooth => 0, 1890 fow_smooth => 0,
1912 gui_fontsize => 1, 1891 gui_fontsize => 1,
1913 log_fontsize => 1, 1892 log_fontsize => 0.7,
1914 gauge_fontsize=> 1, 1893 gauge_fontsize => 1,
1915 gauge_size => 0.35, 1894 gauge_size => 0.35,
1916 stat_fontsize => 1, 1895 stat_fontsize => 0.7,
1917 mapsize => 100, 1896 mapsize => 100,
1918 host => "crossfire.schmorp.de",
1919 say_command => 'say', 1897 say_command => 'say',
1920 audio_enable => 1, 1898 audio_enable => 1,
1921 bgm_enable => 1, 1899 bgm_enable => 1,
1922 bgm_volume => 0.25, 1900 bgm_volume => 0.25,
1923 face_prefetch => 0, 1901 face_prefetch => 0,
1924 output_sync => 1, 1902 output_sync => 1,
1925 output_count => 1, 1903 output_count => 1,
1904 pickup => 0,
1905 default => "profile", # default profile
1906 );
1926 ); 1907
1927
1928 while (my ($k, $v) = each %DEF_CFG) { 1908 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 1909 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 1910 }
1911
1912 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1931 1913
1932 sdl_init; 1914 sdl_init;
1933 1915
1934 @SDL_MODES = reverse 1916 @SDL_MODES = reverse
1935 grep $_->[0] >= 640 && $_->[1] >= 480, 1917 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1977 video_init; 1959 video_init;
1978 audio_init; 1960 audio_init;
1979} 1961}
1980 1962
1981Event::loop; 1963Event::loop;
1964#CFClient::SDL_Quit;
1965#CFClient::_exit 0;
1982 1966
1983END { CFClient::SDL_Quit } 1967END { CFClient::SDL_Quit }
1984 1968
1985=head1 NAME 1969=head1 NAME
1986 1970
1987pclient - A Crossfire+ and Crossfire game client 1971cfplus - A Crossfire+ and Crossfire game client
1988 1972
1989=head1 SYNOPSIS 1973=head1 SYNOPSIS
1990 1974
1991Just run it - no commandline arguments are supported. 1975Just run it - no commandline arguments are supported.
1992 1976
1993=head1 USAGE 1977=head1 USAGE
1994 1978
1995Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1979cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1996fullscreen and interactively. 1980fullscreen and interactively.
1997 1981
1982=head1 DEBUGGING
1983
1984
1985CFPLUS_DEBUG - environment variable
1986
1987 1 draw borders around widgets
1988 2 add low-level widget info to tooltips
1989 4 show fps
1990 8 suppress tooltips
1991
1998=head1 AUTHOR 1992=head1 AUTHOR
1999 1993
2000Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1994Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2001 1995
2002 1996

Diff Legend

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