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.3 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.44 by elmex, Fri Jun 2 16:32:12 2006 UTC

… …
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM; 30use Pod::POM;
31use Event; 31use Event;
32 32
33use Crossfire; 33use Crossfire;
34use Crossfire::Protocol; 34use Crossfire::Protocol::Constants;
35 35
36use Compress::LZF; 36use Compress::LZF;
37 37
38use CFClient; 38use CFClient;
39use CFClient::OpenGL ();
40use CFClient::Protocol;
39use CFClient::UI; 41use CFClient::UI;
40use CFClient::MapWidget; 42use CFClient::MapWidget;
41 43
42$Event::DIED = sub { 44$Event::DIED = sub {
43 # TODO: display dialog box or so 45 # TODO: display dialog box or so
… …
50 52
51my $MAX_FPS = 60; 53my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 54my $MIN_FPS = 5; # unused as of yet
53 55
54our $META_SERVER = "crossfire.real-time.com:13326"; 56our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 57
60our $LAST_REFRESH; 58our $LAST_REFRESH;
61our $NOW; 59our $NOW;
62 60
63our $CFG; 61our $CFG;
… …
83our $LOGVIEW; 81our $LOGVIEW;
84our $CONSOLE; 82our $CONSOLE;
85our $METASERVER; 83our $METASERVER;
86our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
87our $SERVER_SETUP;
88 88
89our $FLOORBOX; 89our $FLOORBOX;
90our $GAUGES; 90our $GAUGES;
91our $STATWIDS; 91our $STATWIDS;
92 92
… …
99 99
100our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 101our $STATUSBOX;
102our $DEBUG_STATUS; 102our $DEBUG_STATUS;
103 103
104our $INVWIN; 104our $INV_WINDOW;
105our $INV; 105our $INV;
106our $INVR; 106our $INVR;
107our $INVR_LBL; 107our $INV_RIGHT_HB;
108our $OPENCONT; 108
109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113our $PICKUP_CFG;
109 114
110sub status { 115sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 117}
113 118
114sub debug { 119sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 120 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 121}
119 122
120sub start_game { 123sub start_game {
121 status "logging in..."; 124 status "logging in...";
122 125
126 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide;
128
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 129 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 130
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 131 my ($host, $port) = split /:/, $CFG->{host};
132
126 $MAP = new CFClient::Map $mapsize, $mapsize; 133 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 134
130 $CONN = eval { 135 $CONN = eval {
131 new conn 136 new CFClient::Protocol
132 host => $host, 137 host => $host,
133 port => $port || 13327, 138 port => $port || 13327,
134 user => $CFG->{user}, 139 user => $CFG->{user},
135 pass => $CFG->{password}, 140 pass => $CFG->{password},
136 mapw => $mapsize, 141 mapw => $mapsize,
137 maph => $mapsize, 142 maph => $mapsize,
138 ; 143
144 map_widget => $MAPWIDGET,
145 logview => $LOGVIEW,
146 statusbox => $STATUSBOX,
147 map => $MAP,
148 mapmap => $MAPMAP,
149
150 sound_play => sub {
151 my ($x, $y, $soundnum, $type) = @_;
152
153 $SDL_MIXER
154 or return;
155
156 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
157 or return;
158
159 $chunk->play;
160 },
139 }; 161 };
140 162
141 if ($CONN) { 163 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 164 CFClient::lowdelay fileno $CONN->{fh};
143 165
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 166 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 167 } else {
151 status "unable to connect"; 168 status "unable to connect";
152 stop_game(); 169 stop_game();
153 } 170 }
154} 171}
155 172
156sub stop_game { 173sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show;
176 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178
157 return unless $CONN; 179 return unless $CONN;
158 180
159 status "connection closed"; 181 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 182
161 $CONN->destroy; 183 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 184 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
168 undef $MAP;
169} 185}
170 186
171sub client_setup { 187sub client_setup {
172 my $dialog = new CFClient::UI::FancyFrame 188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
191 name => "client_setup",
173 title => "Client Setup", 192 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 193 child => (my $vbox = new CFClient::UI::VBox);
194
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 195 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 196
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 197 $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); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 199
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 200 $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"); 201 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 202
183 $mode_slider->connect (changed => sub { 203 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 204 my ($self, $value) = @_;
185 205
… …
192 212
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 214 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 215 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 216 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 217 on_changed => sub {
198 my ($self, $value) = @_; 218 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value; 219 $CFG->{fullscreen} = $value;
200 } 220 }
201 ); 221 );
202 222
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 225 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 226 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 227 on_changed => sub {
208 my ($self, $value) = @_; 228 my ($self, $value) = @_;
209 $CFG->{fast} = $value; 229 $CFG->{fast} = $value;
210 } 230 }
211 ); 231 );
212 232
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 237 on_changed => sub {
218 my ($self, $value) = @_; 238 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value; 239 $CFG->{map_scale} = 2 ** $value;
220 } 240 }
221 ); 241 );
222 242
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 243 $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 244 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 245 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 246 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 247 on_changed => sub {
228 my ($self, $value) = @_; 248 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value; 249 $CFG->{fow_enable} = $value;
230 } 250 }
231 ); 251 );
232 252
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 255 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.", 256 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 { 257 on_changed => sub {
238 my ($self, $value) = @_; 258 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value; 259 $CFG->{fow_intensity} = $value;
240 } 260 }
241 ); 261 );
242 262
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 264 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 265 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 266 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 267 on_changed => sub {
248 my ($self, $value) = @_; 268 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 269 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
251 } 271 }
252 ); 272 );
253 273
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 274 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 275 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 276 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.", 277 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] }, 278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
259 ); 279 );
260 280
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 282 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 283 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.", 284 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]) }, 285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
266 ); 286 );
267 287
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 289
270 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 291 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.", 292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 293 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 294 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 295 &set_stats_window_fontsize;
276 } 296 }
277 ); 297 );
278 298
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 300 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 301 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.", 302 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 303 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 304 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 305 &set_gauge_window_fontsize;
286 } 306 }
287 ); 307 );
288 308
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 309 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 310 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 311 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 312 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 313 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 314 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
296 } 316 }
297 ); 317 );
298 318
299 $table->add (1, $row++, new CFClient::UI::Button 319 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 320 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 321 tooltip => "Apply the video settings",
302 connect_activate => sub { 322 on_activate => sub {
303 video_shutdown (); 323 video_shutdown ();
304 video_init (); 324 video_init ();
305 } 325 }
306 ); 326 );
307 327
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 329 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 330 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.", 331 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 { 332 on_changed => sub {
313 $CFG->{audio_enable} = $_[1]; 333 $CFG->{audio_enable} = $_[1];
314 } 334 }
315 ); 335 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 336# $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 { 337# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 338# $CFG->{effects_volume} = $_[1];
319# }); 339# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 340 $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); 341 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 342 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 343 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 344 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 345 on_changed => sub {
326 $CFG->{bgm_enable} = $_[1]; 346 $CFG->{bgm_enable} = $_[1];
327 } 347 }
328 ); 348 );
329 $hbox->add (new CFClient::UI::Slider 349 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 350 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 351 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 352 on_changed => sub {
333 $CFG->{bgm_volume} = $_[1]; 353 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128; 354 CFClient::MixMusic::volume $_[1] * 128;
335 } 355 }
336 ); 356 );
337 357
338 $table->add (1, $row++, new CFClient::UI::Button 358 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 359 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 360 tooltip => "Apply the audio settings",
341 connect_activate => sub { 361 on_activate => sub {
342 audio_shutdown (); 362 audio_shutdown ();
343 audio_init (); 363 audio_init ();
344 } 364 }
345 ); 365 );
346 366
… …
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command}, 369 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. " 370 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. " 371 . "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.", 372 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353 connect_changed => sub { 373 on_changed => sub {
354 my ($self, $value) = @_; 374 my ($self, $value) = @_;
355 $CFG->{say_command} = $value; 375 $CFG->{say_command} = $value;
356 } 376 }
357 ); 377 );
358 378
… …
373 393
374sub make_gauge_window { 394sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 395 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 396
377 my $win = new CFClient::UI::Frame ( 397 my $win = new CFClient::UI::Frame (
378 req_y => -1, 398 force_x => 0,
399 force_y => "max",
379 user_w => $WIDTH, 400 force_w => $WIDTH,
380 user_h => $gh, 401 force_h => $gh,
381 ); 402 );
382 403
383 $win->add (my $hbox = new CFClient::UI::HBox 404 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 405 children => [
385 (new CFClient::UI::HBox expand => 1), 406 (new CFClient::UI::HBox expand => 1),
… …
421 &set_gauge_window_fontsize; 442 &set_gauge_window_fontsize;
422 443
423 $win 444 $win
424} 445}
425 446
447
426sub make_stats_window { 448sub make_stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 449 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8),
451 x => "max",
452 title => "Stats",
453 name => "stats_window";
428 454
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 455 $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, 456 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 457 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."); 458 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, 459 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1, 460 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server)."); 461 tooltip => "The map you are currently on (if supported by the server).");
462
463 $vb->add (my $hb0 = new CFClient::UI::HBox);
464 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
465 can_hover => 1, can_events => 1,
466 tooltip => "The weight of the player including all inventory items.");
467 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
468 can_hover => 1, can_events => 1,
469 tooltip => "The weight limit: you cannot carry more than this.");
470
436 471
437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 472 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 473 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
439 474
440 my $color2 = [1, 1, 0]; 475 my $color2 = [1, 1, 0];
… …
529} 564}
530 565
531sub update_stats_window { 566sub update_stats_window {
532 my ($stats) = @_; 567 my ($stats) = @_;
533 568
534 # i love text protocols!!! 569 # I love text protocols...
570
535 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 571 my $hp = $stats->{+CS_STAT_HP} * 1;
536 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 572 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
537 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 573 my $sp = $stats->{+CS_STAT_SP} * 1;
538 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 574 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
539 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 575 my $fo = $stats->{+CS_STAT_FOOD} * 1;
540 my $fo_m = 999; 576 my $fo_m = 999;
541 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 577 my $gr = $stats->{+CS_STAT_GRACE} * 1;
542 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 578 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
543 579
544 $GAUGES->{hp} ->set_value ($hp, $hp_m); 580 $GAUGES->{hp} ->set_value ($hp, $hp_m);
545 $GAUGES->{mana} ->set_value ($sp, $sp_m); 581 $GAUGES->{mana} ->set_value ($sp, $sp_m);
546 $GAUGES->{food} ->set_value ($fo, $fo_m); 582 $GAUGES->{food} ->set_value ($fo, $fo_m);
547 $GAUGES->{grace} ->set_value ($gr, $gr_m); 583 $GAUGES->{grace} ->set_value ($gr, $gr_m);
548 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 584 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
549 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 585 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
550 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 586 my $rng = $stats->{+CS_STAT_RANGE};
551 $rng =~ s/^Range: //; # thank you so much dear server 587 $rng =~ s/^Range: //; # thank you so much dear server
552 $GAUGES->{range} ->set_text ("Rng: " . $rng); 588 $GAUGES->{range} ->set_text ("Rng: " . $rng);
553 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 589 my $title = $stats->{+CS_STAT_TITLE};
554 $title =~ s/^Player: //; 590 $title =~ s/^Player: //;
555 $STATWIDS->{title} ->set_text ("Title: " . $title); 591 $STATWIDS->{title} ->set_text ("Title: " . $title);
556 592
557 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 593 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
558 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 594 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
559 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 595 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
560 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 596 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
561 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 597 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
562 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 598 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
563 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 599 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
564 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 600 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
565 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 601 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
566 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 602 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
567 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 603 $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}); 604 $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}); 605 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
570 606
607 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
608
609 # TODO: replace by CS_STAT_RES_xxx constants
571 my %tbl = ( 610 my %tbl = (
572 phys => 100, 611 phys => 100,
573 magic => 101, 612 magic => 101,
574 fire => 102, 613 fire => 102,
575 elec => 103, 614 elec => 103,
… …
584 tund => 112, 623 tund => 112,
585 fear => 113, 624 fear => 113,
586 depl => 113, 625 depl => 113,
587 deat => 115, 626 deat => 115,
588 holyw => 116, 627 holyw => 116,
589 blind => 117 628 blind => 117,
590 ); 629 );
591 630
592 for (keys %tbl) {
593 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
594 } 632 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} 633}
607 634
608my $METASERVER_ATIME; 635my $METASERVER_ATIME;
609 636
610sub update_metaserver { 637sub update_metaserver {
611 my ($HOST) = @_;
612
613 return if $METASERVER_ATIME > time; 638 return if $METASERVER_ATIME > time;
614 $METASERVER_ATIME = time + 60; 639 $METASERVER_ATIME = time + 60;
615 640
616 my $table = $METASERVER->{table}; 641 my $table = $METASERVER->{table};
617 $table->clear; 642 $table->clear;
… …
668 $m = [$users, $host, $uptime, $version, $desc]; 693 $m = [$users, $host, $uptime, $version, $desc];
669 694
670 $y++; 695 $y++;
671 696
672 $table->add (0, $y, new CFClient::UI::VBox children => [ 697 $table->add (0, $y, new CFClient::UI::VBox children => [
673 (new CFClient::UI::Button text => "Use", connect_activate => sub { 698 (new CFClient::UI::Button text => "Use", on_activate => sub {
674 $HOST->set_text ($CFG->{host} = $host); 699 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility;
675 }), 701 }),
676 (new CFClient::UI::Empty expand => 1), 702 (new CFClient::UI::Empty expand => 1),
677 ]); 703 ]);
678 704
679 $table->add ($_ + 1, $y, new CFClient::UI::Label 705 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
682 } 708 }
683 } 709 }
684 }); 710 });
685} 711}
686 712
713sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List",
716 name => 'metaserver_dialog',
717 x => 'center',
718 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub {
721 update_metaserver if $_[1];
722 },
723 ;
724
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog
728}
729
687sub server_setup { 730sub server_setup {
688 my $dialog = new CFClient::UI::FancyFrame 731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
734 name => "server_setup",
689 title => "Server Setup", 735 title => "Server Setup",
690 child => (my $vbox = new CFClient::UI::VBox); 736 child => (my $vbox = new CFClient::UI::VBox),
691 737 ;
738
692 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 739 $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"); 740 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
694 741
695 { 742 {
696 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
697 744
698 $vbox->add ( 745 $vbox->add (
699 my $HOST = new CFClient::UI::Entry 746 $HOST_ENTRY = new CFClient::UI::Entry
700 expand => 1, 747 expand => 1,
701 text => $CFG->{host}, 748 text => $CFG->{host},
702 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
703 connect_changed => sub { 750 on_changed => sub {
704 my ($self, $value) = @_; 751 my ($self, $value) = @_;
705 $CFG->{host} = $value; 752 $CFG->{host} = $value;
706 } 753 }
707 ); 754 );
708 755
709 $METASERVER = metaserver_dialog; 756 $METASERVER = metaserver_dialog;
710 757
711 $vbox->add (new CFClient::UI::Flopper 758 $vbox->add (new CFClient::UI::Button
712 expand => 1, 759 expand => 1,
713 text => "Server List", 760 text => "Server List",
714 other => $METASERVER, 761 other => $METASERVER,
715 tooltip => "Show a list of available crossfire servers", 762 tooltip => "Show a list of available crossfire servers",
716 connect_open => sub { 763 on_activate => sub { $METASERVER->toggle_visibility },
717 update_metaserver $HOST;
718 }
719 ); 764 );
720 } 765 }
721 766
722 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
723 $table->add (1, 4, new CFClient::UI::Entry 768 $table->add (1, 4, new CFClient::UI::Entry
724 text => $CFG->{user}, 769 text => $CFG->{user},
725 tooltip => "The name of your character on the server", 770 tooltip => "The name of your character on the server",
726 connect_changed => sub { 771 on_changed => sub {
727 my ($self, $value) = @_; 772 my ($self, $value) = @_;
728 $CFG->{user} = $value; 773 $CFG->{user} = $value;
729 } 774 }
730 ); 775 );
731 776
732 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 777 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
733 $table->add (1, 5, new CFClient::UI::Entry 778 $table->add (1, 5, new CFClient::UI::Entry
734 text => $CFG->{password}, 779 text => $CFG->{password},
735 hidden => 1, 780 hidden => 1,
736 tooltip => "The password for your character", 781 tooltip => "The password for your character",
737 connect_changed => sub { 782 on_changed => sub {
738 my ($self, $value) = @_; 783 my ($self, $value) = @_;
739 $CFG->{password} = $value; 784 $CFG->{password} = $value;
740 } 785 }
741 ); 786 );
742 787
743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 788 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
744 $table->add (1, 7, new CFClient::UI::Slider 789 $table->add (1, 7, new CFClient::UI::Slider
745 req_w => 100, 790 force_w => 100,
746 range => [$CFG->{mapsize}, 10, 100, 0, 1], 791 range => [$CFG->{mapsize}, 10, 100, 0, 1],
747 tooltip => "This is the size of the portion of the map update the server sends you. " 792 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, " 793 . "If you set this to a high value you will be able to see further, "
749 . "but you also increase bandwidth requirements and latency. " 794 . "but you also increase bandwidth requirements and latency. "
750 . "This option is only used once at log-in.", 795 . "This option is only used once at log-in.",
751 connect_changed => sub { 796 on_changed => sub {
752 my ($self, $value) = @_; 797 my ($self, $value) = @_;
753 798
754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 799 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
755 }, 800 },
756 ); 801 );
… …
763 . "This might increase or create lag, but increases the chances " 808 . "This might increase or create lag, but increases the chances "
764 . "of faces being ready for display when you encounter them. " 809 . "of faces being ready for display when you encounter them. "
765 . "It also uses up server bandwidth on every connect, " 810 . "It also uses up server bandwidth on every connect, "
766 . "so only set it if you really need to prefetch images. " 811 . "so only set it if you really need to prefetch images. "
767 . "This option can be set and unset any time.", 812 . "This option can be set and unset any time.",
768 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 813 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
769 ); 814 );
770 815
771 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 816 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
772 $table->add (1, 9, new CFClient::UI::Entry 817 $table->add (1, 9, new CFClient::UI::Entry
773 text => $CFG->{output_count}, 818 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.", 819 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] }, 820 on_changed => sub { $CFG->{output_count} = $_[1] },
776 ); 821 );
777 822
778 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 823 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
779 $table->add (1, 10, new CFClient::UI::Entry 824 $table->add (1, 10, new CFClient::UI::Entry
780 text => $CFG->{output_sync}, 825 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.", 826 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] }, 827 on_changed => sub { $CFG->{output_sync} = $_[1] },
783 ); 828 );
784 829
785 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 830 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
786 expand => 1, 831 expand => 1,
787 align => 0, 832 align => 0,
788 text => "Login", 833 text => "Login",
789 connect_activate => sub { 834 on_activate => sub {
790 $CONN ? stop_game 835 $CONN ? stop_game
791 : start_game; 836 : start_game;
792 }, 837 },
793 ); 838 );
794 839
795 $dialog 840 $dialog
796} 841}
797 842
798sub message_window { 843sub message_window {
799 my $window = new CFClient::UI::FancyFrame 844 my $window = new CFClient::UI::FancyFrame
845 name => "message_window",
800 title => "Messages", 846 title => "Messages",
801 border_bg => [1, 1, 1, 1], 847 border_bg => [1, 1, 1, 1],
802 bg => [0, 0, 0, 0.75], 848 bg => [0, 0, 0, 0.75],
849 x => "max",
850 y => 0,
803 user_w => int $::WIDTH / 3, 851 force_w => $::WIDTH / 3,
804 user_h => int $::HEIGHT / 5, 852 force_h => $::HEIGHT / 5,
805 child => (my $vbox = new CFClient::UI::VBox); 853 child => (my $vbox = new CFClient::UI::VBox);
806 854
807 $vbox->add ($LOGVIEW); 855 $vbox->add ($LOGVIEW);
808 856
809 $vbox->add (my $input = new CFClient::UI::Entry 857 $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> " 858 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>...). " 859 . "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). " 860 . "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.", 861 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
814 connect_focus_in => sub { 862 on_focus_in => sub {
815 my ($input, $prev_focus) = @_; 863 my ($input, $prev_focus) = @_;
816 864
817 delete $input->{refocus_map}; 865 delete $input->{refocus_map};
818 866
819 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 867 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
820 $input->{refocus_map} = 1; 868 $input->{refocus_map} = 1;
821 } 869 }
822 delete $input->{auto_activated}; 870 delete $input->{auto_activated};
823 }, 871 },
824 connect_activate => sub { 872 on_activate => sub {
825 my ($input, $text) = @_; 873 my ($input, $text) = @_;
826 $input->set_text (''); 874 $input->set_text ('');
827 875
876 if ($text =~ /^\/bind\s+(.*)$/) {
877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
828 if ($text =~ /^\/(.*)/) { 881 } elsif ($text =~ /^\/(.*)/) {
829 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
830 } else { 883 } else {
831 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
832 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
833 } 886 }
834 if ($input->{refocus_map}) { 887 if ($input->{refocus_map}) {
835 delete $input->{refocus_map}; 888 delete $input->{refocus_map};
836 $MAPWIDGET->focus_in 889 $MAPWIDGET->focus_in
837 } 890 }
838 }, 891 },
839 connect_escape => sub { 892 on_escape => sub {
840 $MAPWIDGET->focus_in 893 $MAPWIDGET->focus_in
841 }, 894 },
842 ); 895 );
843 896
844 $CONSOLE = { 897 $CONSOLE = {
845 window => $window, 898 window => $window,
846 input => $input 899 input => $input,
847 }; 900 };
848 901
849 $window 902 $window
850} 903}
851 904
852sub open_quit_dialog { 905sub open_quit_dialog {
853 unless ($QUIT_DIALOG) { 906 unless ($QUIT_DIALOG) {
854
855 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 907 $QUIT_DIALOG = new CFClient::UI::FancyFrame
908 x => "center",
909 y => "center",
910 title => "Really Quit?",
911 ;
856 912
857 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 913 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
858 914
859 $vb->add (new CFClient::UI::Label 915 $vb->add (new CFClient::UI::Label
860 text => "You should find a savebed and apply it first!", 916 text => "You should find a savebed and apply it first!",
… …
863 ); 919 );
864 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 920 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
865 $hb->add (new CFClient::UI::Button 921 $hb->add (new CFClient::UI::Button
866 text => "Ok", 922 text => "Ok",
867 expand => 1, 923 expand => 1,
868 connect_activate => sub { $QUIT_DIALOG->hide }, 924 on_activate => sub { $QUIT_DIALOG->hide },
869 ); 925 );
870 $hb->add (new CFClient::UI::Button 926 $hb->add (new CFClient::UI::Button
871 text => "Quit anyway", 927 text => "Quit anyway",
872 expand => 1, 928 expand => 1,
873 connect_activate => sub { exit }, 929 on_activate => sub { exit },
874 ); 930 );
931 }
875 932
876 $QUIT_DIALOG->show_centered; 933 $QUIT_DIALOG->show;
934}
935
936sub make_pickup_cfg_window {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 title => "Autopickup configuration",
939 x => "center",
940 y => "center",
941 force_w => $WIDTH * 3/10,
942 force_h => $HEIGHT * 9/10;
943
944 my $tbl = new CFClient::UI::Table;
945 my $tblrow = 0;
946
947 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl, expand => 1);
948
949 for (
950 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE],
951 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
952 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
953 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
954 ["Weapons"],
955 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
956 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
957 ["Bows" => CFClient::Pickup::PU_BOW],
958 ["Arrows" => CFClient::Pickup::PU_ARROW],
959 ["Armour"],
960 ["Helmets" => CFClient::Pickup::PU_HELMET],
961 ["Shields" => CFClient::Pickup::PU_SHIELD],
962 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
963 ["Boots" => CFClient::Pickup::PU_BOOTS],
964 ["Gloves" => CFClient::Pickup::PU_GLOVES],
965 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
966 ["Readables"],
967 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
968 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
969 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
970 ["Misc"],
971 ["Food" => CFClient::Pickup::PU_FOOD],
972 ["Drinks" => CFClient::Pickup::PU_DRINK],
973 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
974 ["Keys" => CFClient::Pickup::PU_KEY],
975 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
976 ["Potions" => CFClient::Pickup::PU_POTION],
977 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
978 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
979 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
980 )
981 {
982 unless (defined $_->[1]) {
983 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0);
877 } else { 984 } else {
878 $QUIT_DIALOG->show_centered; 985 my $mask = $_->[1];
986 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1);
987 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
988 state => $CFG->{pickup} & $mask,
989 on_changed => sub {
990 my ($box, $value) = @_;
991 if ($value) {
992 $CFG->{pickup} |= $mask;
993 } else {
994 $CFG->{pickup} = $CFG->{pickup} & ~$mask;
995 }
996 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup});
997 });
998 }
879 } 999 }
1000
1001 $PICKUP_CFG
880} 1002}
881 1003
882sub make_inventory_window { 1004sub make_inventory_window {
883 my $invwin = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
884 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1006 x => "center",
1007 y => "center",
1008 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10,
1010 title => "Inventory",
1011 ;
885 1012
886 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
887 1014
888 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
889 $vb1->add (my $lbl = new CFClient::UI::Label); 1016 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
890 $lbl->set_text ("Player");
891 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1017 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
892 1018
893 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1019 $hb->add (my $vb2 = new CFClient::UI::VBox);
1020
894 $vb2->add ($INVR_LBL = new CFClient::UI::Label); 1021 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
895 $INVR_LBL->set_text ("Floor"); 1022
896 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1023 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
897 1024
1025 # XXX: Call after $INVR = ... because set_opencont sets the items
1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027
898 $invwin 1028 $invwin
1029}
1030
1031sub make_spell_list {
1032 $SPELL_LIST = new CFClient::UI::SpellList
1033 force_w => $WIDTH * (9/10),
1034 force_h => $HEIGHT * (9/10);
1035 $SPELL_LIST
1036}
1037
1038sub make_binding_window {
1039 my $binding_list = new CFClient::UI::VBox;
1040
1041 my $refresh;
1042 $refresh = sub {
1043 $binding_list->clear ();
1044
1045 for my $mod (keys %{$::CFG->{bindings}}) {
1046 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1047 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1048 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1049
1050 my $lbl = join "; ", @$cmds;
1051 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1052 $binding_list->add (my $hb = new CFClient::UI::HBox);
1053 $hb->add (new CFClient::UI::Button
1054 text => "delete",
1055 tooltip => "Deletes the binding",
1056 on_activate => sub {
1057 $binding_list->remove ($hb);
1058 delete $::CFG->{bindings}->{$mod}->{$sym};
1059 });
1060
1061 $hb->add (new CFClient::UI::Button
1062 text => "edit",
1063 tooltip => "Edits the binding",
1064 on_activate => sub {
1065 $::BIND_EDITOR->set_binding (
1066 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1067 sub {
1068 my ($nmod, $nsym, $ncmds) = @_;
1069 delete $::CFG->{bindings}->{$mod}->{$sym};
1070 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1071 $refresh->();
1072 $::BIND_WINDOW->show;
1073 },
1074 sub {
1075 $::BIND_WINDOW->show;
1076 });
1077 $::BIND_EDITOR->show;
1078 $::BIND_WINDOW->hide;
1079 });
1080
1081 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1082 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1083 }
1084 }
1085 };
1086
1087 $BIND_WINDOW = new CFClient::UI::FancyFrame
1088 title => "Bindings",
1089 x => "center",
1090 y => "center",
1091 def_w => int $WIDTH * 9/10,
1092 def_h => int $HEIGHT * 9/10,
1093 on_visibility_change => sub {
1094 my ($self, $visible) = @_;
1095 $refresh->() if $visible;
1096 };
1097
1098 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1099 $vb->add ($binding_list);
1100 $vb->add (my $hb = new CFClient::UI::HBox);
1101 $hb->add (new CFClient::UI::Button
1102 text => "record new",
1103 expand => 1,
1104 tooltip => "This button opens the binding editor with an empty binding.",
1105 on_activate => sub {
1106 $::BIND_EDITOR->set_binding (undef, undef, [],
1107 sub {
1108 my ($mod, $sym, $cmds) = @_;
1109 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1110 $refresh->();
1111 $::BIND_WINDOW->show;
1112 },
1113 sub {
1114 $::BIND_WINDOW->show;
1115 });
1116 $::BIND_WINDOW->hide;
1117 $::BIND_EDITOR->show;
1118 },
1119 );
1120 $hb->add (new CFClient::UI::Button
1121 text => "close",
1122 tooltip => "Closes the binding window",
1123 expand => 1,
1124 on_activate => sub {
1125 $::BIND_WINDOW->hide;
1126 }
1127 );
1128
1129 $refresh->();
1130 $BIND_WINDOW
899} 1131}
900 1132
901sub make_help_window { 1133sub make_help_window {
902 my $win = new CFClient::UI::FancyFrame 1134 my $win = new CFClient::UI::FancyFrame
903 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1135 x => 'center',
1136 y => 'center',
1137 name => 'doc_browser',
1138 force_w => int $WIDTH * 7/8,
1139 force_h => int $HEIGHT * 7/8,
1140 title => "Documentation";
904 1141
905 $win->add (my $vbox = new CFClient::UI::VBox); 1142 $win->add (my $vbox = new CFClient::UI::VBox);
906 1143
907 $vbox->add (my $buttons = new CFClient::UI::HBox); 1144 $vbox->add (my $buttons = new CFClient::UI::HBox);
908 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1145 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
915 ) { 1152 ) {
916 my ($pod, $label) = @$_; 1153 my ($pod, $label) = @$_;
917 1154
918 $buttons->add (new CFClient::UI::Button 1155 $buttons->add (new CFClient::UI::Button
919 text => $label, 1156 text => $label,
920 connect_activate => sub { 1157 on_activate => sub {
921 my $parser = new Pod::POM; 1158 my $parser = new Pod::POM;
922 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1159 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
923 1160
924 $viewer->clear; 1161 $viewer->clear;
925 1162
… …
956 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1193 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
957 1194
958 $SDL_ACTIVE = 1; 1195 $SDL_ACTIVE = 1;
959 $LAST_REFRESH = time - 0.01; 1196 $LAST_REFRESH = time - 0.01;
960 1197
961 CFClient::gl_init; 1198 CFClient::OpenGL::init;
962 1199
963 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1200 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
964 1201
965 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1202 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
966 1203
… …
969 if ($DEBUG_STATUS) { 1206 if ($DEBUG_STATUS) {
970 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1207 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
971 } else { 1208 } else {
972 # create the widgets 1209 # create the widgets
973 1210
974 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1211 $DEBUG_STATUS = new CFClient::UI::Label
1212 padding => 0,
1213 z => 100,
1214 force_x => "max",
1215 force_y => 0;
975 $DEBUG_STATUS->show; 1216 $DEBUG_STATUS->show;
976 1217
1218 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1219
977 $STATUSBOX = new CFClient::UI::Statusbox; 1220 $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]); 1221 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
979 1222
980 (new CFClient::UI::Frame 1223 (new CFClient::UI::Frame
981 bg => [0, 0, 0, 0.4], 1224 bg => [0, 0, 0, 0.4],
982 req_y => -1, 1225 force_x => 0,
1226 force_y => "max",
983 child => $STATUSBOX, 1227 child => $STATUSBOX,
984 )->show; 1228 )->show;
985 1229
986 CFClient::UI::FancyFrame->new ( 1230 CFClient::UI::FancyFrame->new (
1231 title => "Mini Map",
1232 name => "mapmap",
1233 x => 0,
1234 y => $FONTSIZE + 8,
987 border_bg => [1, 1, 1, 192/255], 1235 border_bg => [1, 1, 1, 192/255],
988 bg => [1, 1, 1, 0], 1236 bg => [1, 1, 1, 0],
989 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1237 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.", 1238 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
991 ), 1239 ),
… …
1014 can_hover => 1, 1262 can_hover => 1,
1015 can_events => 1, 1263 can_events => 1,
1016 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1264 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1017 ; 1265 ;
1018 1266
1019 $BUTTONBAR = new CFClient::UI::HBox; 1267 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1020 1268
1021 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1269 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1022 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1270 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1023 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1271 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1024 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1272 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
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 1276 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 1277
1030 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1278 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1031 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1279 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, 1280 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1033 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1281 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1282 ."You can also hit the Tab-key to show/hide the Inventory.");
1034 1283
1035 $BUTTONBAR->add (new CFClient::UI::Button 1284 $BUTTONBAR->add (new CFClient::UI::Button
1036 text => "Save Config", 1285 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.", 1286 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 { 1287 on_activate => sub {
1288 $::CFG->{layout} = CFClient::UI::get_layout;
1039 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1289 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1040 status "Configuration Saved"; 1290 status "Configuration Saved";
1041 }, 1291 },
1042 ); 1292 );
1043 1293
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1045 tooltip => "View Documentation"); 1295 tooltip => "View Documentation");
1046 1296
1297 $BUTTONBAR->add (new CFClient::UI::Flopper
1298 text => "Bindings",
1299 other => make_binding_window,
1300 tooltip =>
1301 "Lets you define, edit and delete bindings."
1302 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1303 ."with nothing set and the recording started. After doing the actions you "
1304 ."want to record press Insert and you will be asked to press a key-combo."
1305 ."After pressing the combo the binding will be saved automatically and the "
1306 ."binding editor closes");
1307
1308 $BUTTONBAR->add (new CFClient::UI::Flopper
1309 text => "Spells",
1310 other => make_spell_list,
1311 tooltip => "The spell list");
1312
1313 $BUTTONBAR->add (new CFClient::UI::Flopper
1314 text => "Pickup",
1315 other => make_pickup_cfg_window,
1316 tooltip => "The pickup dialog");
1317
1318
1047 $BUTTONBAR->add (new CFClient::UI::Button 1319 $BUTTONBAR->add (new CFClient::UI::Button
1048 text => "Quit", 1320 text => "Quit",
1049 tooltip => "Terminates the program", 1321 tooltip => "Terminates the program",
1050 connect_activate => sub { 1322 on_activate => sub {
1051 if ($CONN) { 1323 if ($CONN) {
1052 open_quit_dialog; 1324 open_quit_dialog;
1053 } else { 1325 } else {
1054 exit; 1326 exit;
1055 } 1327 }
1056 }, 1328 },
1057 ); 1329 );
1058 1330
1059 $BUTTONBAR->show; 1331 $BUTTONBAR->show;
1332 $SERVER_SETUP->show;
1060 1333
1061 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1334 $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 } 1335 }
1071} 1336}
1072 1337
1073sub video_shutdown { 1338sub video_shutdown {
1074 undef $SDL_ACTIVE; 1339 undef $SDL_ACTIVE;
… …
1142 1407
1143my %demo;#d# 1408my %demo;#d#
1144 1409
1145sub force_refresh { 1410sub force_refresh {
1146 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1411 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1147 debug sprintf "%3.2f", $fps; 1412 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1148 1413
1149 $CFClient::UI::ROOT->draw; 1414 $CFClient::UI::ROOT->draw;
1150 1415
1151 $WANT_REFRESH = 0; 1416 $WANT_REFRESH = 0;
1152 $CAN_REFRESH = 0; 1417 $CAN_REFRESH = 0;
… …
1235sub animation_stop { 1500sub animation_stop {
1236 my ($widget) = @_; 1501 my ($widget) = @_;
1237 delete $animate_object{$widget}; 1502 delete $animate_object{$widget};
1238} 1503}
1239 1504
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 1505# check once/second for faces that need to be prefetched
1735# this should, of course, only run on demand, but 1506# this should, of course, only run on demand, but
1736# SDL forces worse things on us.... 1507# SDL forces worse things on us....
1737 1508
1738Event->timer (after => 1, interval => 0.25, cb => sub { 1509Event->timer (after => 1, interval => 0.25, cb => sub {
1739 $CONN->face_prefetch 1510 $CONN->face_prefetch
1740 if $CONN; 1511 if $CONN;
1741}); 1512});
1742
1743sub update_floorbox {
1744 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1745 return unless $CONN;
1746
1747 $FLOORBOX->clear;
1748 $FLOORBOX->add (0, 1, new CFClient::UI::Empty expand => 1);
1749
1750 my $row;
1751 for (@{ $CONN->{container}{0} }) {
1752 if (++$row < 7) {
1753 local $_->{face_widget}; # hack to force recreation of widget
1754 local $_->{desc_widget}; # hack to force recreation of widget
1755 CFClient::Item::update_widgets $_;
1756
1757 $FLOORBOX->add (0, $row, $_->{face_widget});
1758 $FLOORBOX->add (1, $row, $_->{desc_widget});
1759 } else {
1760 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1761 last;
1762 }
1763 }
1764 });
1765
1766 $WANT_REFRESH++;
1767}
1768
1769sub conn::container_add {
1770 my ($self, $tag, $items) = @_;
1771
1772 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1773
1774 if ($tag == 0) {
1775 update_floorbox;
1776 $OPENCONT = 0;
1777 $INVR_LBL->set_text ("Floor");
1778 $INVR->set_items ($self->{container}{0});
1779 } elsif ($tag == $self->{player}{tag}) {
1780 $INVR_LBL->set_text ("Player");
1781 $INV->set_items ($self->{container}{$self->{player}{tag}})
1782 } else {
1783 $OPENCONT = $tag;
1784 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1785 $INVR->set_items ($self->{container}{$tag});
1786 }
1787
1788 # $self-<{player}{tag} => player inv
1789 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1790}
1791
1792sub conn::container_clear {
1793 my ($self, $tag) = @_;
1794
1795 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1796
1797 if ($tag == 0) {
1798 update_floorbox;
1799 $OPENCONT = 0;
1800 $INVR_LBL->set_text ("Floor");
1801 $INVR->set_items ($self->{container}{0});
1802 } elsif ($tag == $self->{player}{tag}) {
1803 $INVR_LBL->set_text ("Player");
1804 $INV->set_items ($self->{container}{$tag})
1805 } else {
1806 $OPENCONT = $tag;
1807 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1808 $INVR->set_items ($self->{container}{$tag});
1809 }
1810
1811# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1812}
1813
1814sub conn::item_delete {
1815 my ($self, @items) = @_;
1816
1817 for (@items) {
1818 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1819
1820 if ($_->{container} == 0) {
1821 update_floorbox;
1822 $OPENCONT = 0;
1823 $INVR_LBL->set_text ("Floor");
1824 $INVR->set_items ($self->{container}{0});
1825 } elsif ($_->{container} == $self->{player}{tag}) {
1826 $INVR_LBL->set_text ("Player");
1827 $INV->set_items ($self->{container}{$self->{player}{tag}})
1828 } else {
1829 $OPENCONT = $_->{container};
1830 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1831 $INVR->set_items ($self->{container}{$_->{container}});
1832 }
1833 }
1834}
1835
1836sub conn::item_update {
1837 my ($self, $item) = @_;
1838
1839 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1840
1841 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1842 $OPENCONT = 0;
1843 $INVR_LBL->set_text ("Floor");
1844 $INVR->set_items ($self->{container}{0});
1845
1846 $item->{widget}->update_item
1847 if $item->{widget};
1848 } else {
1849 if ($item->{container} == 0) {
1850 update_floorbox;
1851 $OPENCONT = 0;
1852 $INVR_LBL->set_text ("Floor");
1853 $INVR->set_items ($self->{container}{0});
1854 } elsif ($item->{container} == $self->{player}{tag}) {
1855 $INV->set_items ($self->{container}{$item->{container}})
1856 }
1857 }
1858}
1859 1513
1860%SDL_CB = ( 1514%SDL_CB = (
1861 CFClient::SDL_QUIT => sub { 1515 CFClient::SDL_QUIT => sub {
1862 Event::unloop -1; 1516 Event::unloop -1;
1863 }, 1517 },
… …
1895############################################################################# 1549#############################################################################
1896 1550
1897$SIG{INT} = $SIG{TERM} = sub { exit }; 1551$SIG{INT} = $SIG{TERM} = sub { exit };
1898 1552
1899{ 1553{
1900 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1554 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1901 1555
1902 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1556 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1903 1557 CFClient::UI::set_layout ($::CFG->{layout});
1904 $TILECACHE = CFClient::db_table "tilecache";
1905 $FACEMAP = CFClient::db_table "facemap";
1906 1558
1907 my %DEF_CFG = ( 1559 my %DEF_CFG = (
1908 sdl_mode => 0, 1560 sdl_mode => 0,
1909 width => 640, 1561 width => 640,
1910 height => 480, 1562 height => 480,
… …
1987 1639
1988END { CFClient::SDL_Quit } 1640END { CFClient::SDL_Quit }
1989 1641
1990=head1 NAME 1642=head1 NAME
1991 1643
1992pclient - A Crossfire+ and Crossfire game client 1644cfplus - A Crossfire+ and Crossfire game client
1993 1645
1994=head1 SYNOPSIS 1646=head1 SYNOPSIS
1995 1647
1996Just run it - no commandline arguments are supported. 1648Just run it - no commandline arguments are supported.
1997 1649
1998=head1 USAGE 1650=head1 USAGE
1999 1651
2000Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1652cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2001fullscreen and interactively. 1653fullscreen and interactively.
2002 1654
1655=head1 DEBUGGING
1656
1657
1658CFPLUS_DEBUG - environment variable
1659
1660 1 draw borders around widgets
1661 2 add low-level widget info to tooltips
1662 4 show fps
1663 8 suppress tooltips
1664
2003=head1 AUTHOR 1665=head1 AUTHOR
2004 1666
2005Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1667Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2006 1668
2007 1669

Diff Legend

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