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.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.38 by elmex, Wed May 31 13:44:26 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::Base; 34use Crossfire::Protocol::Constants;
35 35
36use Compress::LZF; 36use Compress::LZF;
37 37
38use CFClient; 38use CFClient;
39use CFClient::OpenGL (); 39use CFClient::OpenGL ();
… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $SERVER_SETUP;
86 87
87our $FLOORBOX; 88our $FLOORBOX;
88our $GAUGES; 89our $GAUGES;
89our $STATWIDS; 90our $STATWIDS;
90 91
… …
97 98
98our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
102our $INVWIN; 103our $INV_WINDOW;
103our $INV; 104our $INV;
104our $INVR; 105our $INVR;
105our $INVR_LBL; 106our $INV_RIGHT_HB;
107
108our $BIND_WINDOW;
109our $BIND_EDITOR;
110
111our $SPELL_LIST;
106 112
107sub status { 113sub status {
108 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 114 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
109} 115}
110 116
111sub debug { 117sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 118 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request;
114 $DEBUG_STATUS->move ($WIDTH - $w, 0);
115} 119}
116 120
117sub start_game { 121sub start_game {
118 status "logging in..."; 122 status "logging in...";
123
124 $LOGIN_BUTTON->set_text ("Logout");
125 $SERVER_SETUP->hide;
119 126
120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 127 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121 128
122 my ($host, $port) = split /:/, $CFG->{host}; 129 my ($host, $port) = split /:/, $CFG->{host};
123 130
… …
152 }; 159 };
153 160
154 if ($CONN) { 161 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 162 CFClient::lowdelay fileno $CONN->{fh};
156 163
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 164 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 165 } else {
164 status "unable to connect"; 166 status "unable to connect";
165 stop_game(); 167 stop_game();
166 } 168 }
167} 169}
168 170
169sub stop_game { 171sub stop_game {
172 $LOGIN_BUTTON->set_text ("Login");
173 $SERVER_SETUP->show;
174 $INV_WINDOW->hide;
175 $LOGVIEW->hide;
176
170 return unless $CONN; 177 return unless $CONN;
171 178
172 status "connection closed"; 179 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 180
174 $CONN->destroy; 181 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 182 $CONN = 0; # false, does not autovivify
176
177 $BUTTONBAR->{children}[1]->emit ("activate")
178 unless $BUTTONBAR->{children}[1]->{state};
179} 183}
180 184
181sub client_setup { 185sub client_setup {
182 my $dialog = new CFClient::UI::FancyFrame 186 my $dialog = new CFClient::UI::FancyFrame
187 x => 1,
188 y => $HEIGHT * (1/8),
189 name => "client_setup",
183 title => "Client Setup", 190 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 191 child => (my $vbox = new CFClient::UI::VBox);
192
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 194
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 197
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 198 $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]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 199 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 200
193 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 202 my ($self, $value) = @_;
195 203
… …
202 210
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 211 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 212 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 213 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 214 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 215 on_changed => sub {
208 my ($self, $value) = @_; 216 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 217 $CFG->{fullscreen} = $value;
210 } 218 }
211 ); 219 );
212 220
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 221 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 222 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 223 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 224 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 225 on_changed => sub {
218 my ($self, $value) = @_; 226 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 227 $CFG->{fast} = $value;
220 } 228 }
221 ); 229 );
222 230
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 232 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 235 on_changed => sub {
228 my ($self, $value) = @_; 236 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 237 $CFG->{map_scale} = 2 ** $value;
230 } 238 }
231 ); 239 );
232 240
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 242 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 243 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 244 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 245 on_changed => sub {
238 my ($self, $value) = @_; 246 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 247 $CFG->{fow_enable} = $value;
240 } 248 }
241 ); 249 );
242 250
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 251 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 252 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 253 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 254 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
247 connect_changed => sub { 255 on_changed => sub {
248 my ($self, $value) = @_; 256 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 257 $CFG->{fow_intensity} = $value;
250 } 258 }
251 ); 259 );
252 260
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 262 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 263 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 264 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 265 on_changed => sub {
258 my ($self, $value) = @_; 266 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 267 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 269 }
262 ); 270 );
263 271
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 274 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 275 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
268 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 276 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 277 );
270 278
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 281 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 282 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
275 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 283 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 284 );
277 285
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 286 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279 287
280 $table->add (1, $row++, new CFClient::UI::Slider 288 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 289 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 290 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 291 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 292 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 293 &set_stats_window_fontsize;
286 } 294 }
287 ); 295 );
288 296
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 297 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 298 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 299 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 300 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 301 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 302 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 303 &set_gauge_window_fontsize;
296 } 304 }
297 ); 305 );
298 306
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 308 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 309 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 310 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 311 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 312 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 314 }
307 ); 315 );
308 316
309 $table->add (1, $row++, new CFClient::UI::Button 317 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 318 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 319 tooltip => "Apply the video settings",
312 connect_activate => sub { 320 on_activate => sub {
313 video_shutdown (); 321 video_shutdown ();
314 video_init (); 322 video_init ();
315 } 323 }
316 ); 324 );
317 325
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 326 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 327 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 328 state => $CFG->{audio_enable},
321 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 329 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
322 connect_changed => sub { 330 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 331 $CFG->{audio_enable} = $_[1];
324 } 332 }
325 ); 333 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 334# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
327# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 335# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 336# $CFG->{effects_volume} = $_[1];
329# }); 337# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 339 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 340 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 341 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 342 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 343 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 344 $CFG->{bgm_enable} = $_[1];
337 } 345 }
338 ); 346 );
339 $hbox->add (new CFClient::UI::Slider 347 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 348 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 349 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 350 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 351 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 352 CFClient::MixMusic::volume $_[1] * 128;
345 } 353 }
346 ); 354 );
347 355
348 $table->add (1, $row++, new CFClient::UI::Button 356 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 357 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 358 tooltip => "Apply the audio settings",
351 connect_activate => sub { 359 on_activate => sub {
352 audio_shutdown (); 360 audio_shutdown ();
353 audio_init (); 361 audio_init ();
354 } 362 }
355 ); 363 );
356 364
… …
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 366 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command}, 367 text => $CFG->{say_command},
360 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 368 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 369 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 370 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub { 371 on_changed => sub {
364 my ($self, $value) = @_; 372 my ($self, $value) = @_;
365 $CFG->{say_command} = $value; 373 $CFG->{say_command} = $value;
366 } 374 }
367 ); 375 );
368 376
… …
383 391
384sub make_gauge_window { 392sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 393 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 394
387 my $win = new CFClient::UI::Frame ( 395 my $win = new CFClient::UI::Frame (
388 req_y => -1, 396 force_x => 0,
397 force_y => "max",
389 user_w => $WIDTH, 398 force_w => $WIDTH,
390 user_h => $gh, 399 force_h => $gh,
391 ); 400 );
392 401
393 $win->add (my $hbox = new CFClient::UI::HBox 402 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 403 children => [
395 (new CFClient::UI::HBox expand => 1), 404 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 440 &set_gauge_window_fontsize;
432 441
433 $win 442 $win
434} 443}
435 444
445
436sub make_stats_window { 446sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 447 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8),
449 x => "max",
450 title => "Stats",
451 name => "stats_window";
438 452
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 453 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 456 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
445 tooltip => "The map you are currently on (if supported by the server)."); 459 tooltip => "The map you are currently on (if supported by the server).");
446 460
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 461 $vb->add (my $hb0 = new CFClient::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 462 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 463 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 464 tooltip => "The weight of the player including all inventory items.");
451 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 465 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 466 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 467 tooltip => "The weight limit: you cannot carry more than this.");
454 468
455 469
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 470 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 471 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 472
… …
548} 562}
549 563
550sub update_stats_window { 564sub update_stats_window {
551 my ($stats) = @_; 565 my ($stats) = @_;
552 566
553 # i love text protocols!!! 567 # I love text protocols...
554 my $hp = $stats->{Crossfire::Protocol::Base::CS_STAT_HP} * 1; 568
569 my $hp = $stats->{+CS_STAT_HP} * 1;
555 my $hp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXHP} * 1; 570 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
556 my $sp = $stats->{Crossfire::Protocol::Base::CS_STAT_SP} * 1; 571 my $sp = $stats->{+CS_STAT_SP} * 1;
557 my $sp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXSP} * 1; 572 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
558 my $fo = $stats->{Crossfire::Protocol::Base::CS_STAT_FOOD} * 1; 573 my $fo = $stats->{+CS_STAT_FOOD} * 1;
559 my $fo_m = 999; 574 my $fo_m = 999;
560 my $gr = $stats->{Crossfire::Protocol::Base::CS_STAT_GRACE} * 1; 575 my $gr = $stats->{+CS_STAT_GRACE} * 1;
561 my $gr_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXGRACE} * 1; 576 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
562 577
563 $GAUGES->{hp} ->set_value ($hp, $hp_m); 578 $GAUGES->{hp} ->set_value ($hp, $hp_m);
564 $GAUGES->{mana} ->set_value ($sp, $sp_m); 579 $GAUGES->{mana} ->set_value ($sp, $sp_m);
565 $GAUGES->{food} ->set_value ($fo, $fo_m); 580 $GAUGES->{food} ->set_value ($fo, $fo_m);
566 $GAUGES->{grace} ->set_value ($gr, $gr_m); 581 $GAUGES->{grace} ->set_value ($gr, $gr_m);
567 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) 582 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
568 . " (lvl " . ($stats->{Crossfire::Protocol::Base::CS_STAT_LEVEL} * 1) . ")"); 583 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
569 my $rng = $stats->{Crossfire::Protocol::Base::CS_STAT_RANGE}; 584 my $rng = $stats->{+CS_STAT_RANGE};
570 $rng =~ s/^Range: //; # thank you so much dear server 585 $rng =~ s/^Range: //; # thank you so much dear server
571 $GAUGES->{range} ->set_text ("Rng: " . $rng); 586 $GAUGES->{range} ->set_text ("Rng: " . $rng);
572 my $title = $stats->{Crossfire::Protocol::Base::CS_STAT_TITLE}; 587 my $title = $stats->{+CS_STAT_TITLE};
573 $title =~ s/^Player: //; 588 $title =~ s/^Player: //;
574 $STATWIDS->{title} ->set_text ("Title: " . $title); 589 $STATWIDS->{title} ->set_text ("Title: " . $title);
575 590
576 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 591 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
577 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 592 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
578 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 593 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
579 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 594 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
580 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 595 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
581 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 596 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 597 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 598 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 599 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 600 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 601 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
587 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_SPEED}); 602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_WEAP_SP}); 603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
589 604
590 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::Base::CS_STAT_WEIGHT_LIM} / 1000); 605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
591 606
607 # TODO: replace by CS_STAT_RES_xxx constants
592 my %tbl = ( 608 my %tbl = (
593 phys => 100, 609 phys => 100,
594 magic => 101, 610 magic => 101,
595 fire => 102, 611 fire => 102,
596 elec => 103, 612 elec => 103,
… …
605 tund => 112, 621 tund => 112,
606 fear => 113, 622 fear => 113,
607 depl => 113, 623 depl => 113,
608 deat => 115, 624 deat => 115,
609 holyw => 116, 625 holyw => 116,
610 blind => 117 626 blind => 117,
611 ); 627 );
612 628
613 for (keys %tbl) {
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615 } 630 for keys %tbl;
616
617} 631}
618 632
619sub metaserver_dialog { 633sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame 634 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List", 635 title => "Server List",
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 703 $m = [$users, $host, $uptime, $version, $desc];
690 704
691 $y++; 705 $y++;
692 706
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 707 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 708 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 709 $HOST->set_text ($CFG->{host} = $host);
696 }), 710 }),
697 (new CFClient::UI::Empty expand => 1), 711 (new CFClient::UI::Empty expand => 1),
698 ]); 712 ]);
699 713
… …
704 } 718 }
705 }); 719 });
706} 720}
707 721
708sub server_setup { 722sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 723 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
724 x => "center",
725 y => "center",
726 name => "server_setup",
710 title => "Server Setup", 727 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 728 child => (my $vbox = new CFClient::UI::VBox),
712 729 ;
730
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 731 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 732 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 733
716 { 734 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 735 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
719 $vbox->add ( 737 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 738 my $HOST = new CFClient::UI::Entry
721 expand => 1, 739 expand => 1,
722 text => $CFG->{host}, 740 text => $CFG->{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 741 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 742 on_changed => sub {
725 my ($self, $value) = @_; 743 my ($self, $value) = @_;
726 $CFG->{host} = $value; 744 $CFG->{host} = $value;
727 } 745 }
728 ); 746 );
729 747
… …
732 $vbox->add (new CFClient::UI::Flopper 750 $vbox->add (new CFClient::UI::Flopper
733 expand => 1, 751 expand => 1,
734 text => "Server List", 752 text => "Server List",
735 other => $METASERVER, 753 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 754 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 755 on_open => sub {
738 update_metaserver $HOST; 756 update_metaserver $HOST;
739 } 757 }
740 ); 758 );
741 } 759 }
742 760
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 761 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 762 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 763 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 764 tooltip => "The name of your character on the server",
747 connect_changed => sub { 765 on_changed => sub {
748 my ($self, $value) = @_; 766 my ($self, $value) = @_;
749 $CFG->{user} = $value; 767 $CFG->{user} = $value;
750 } 768 }
751 ); 769 );
752 770
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 771 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 772 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 773 text => $CFG->{password},
756 hidden => 1, 774 hidden => 1,
757 tooltip => "The password for your character", 775 tooltip => "The password for your character",
758 connect_changed => sub { 776 on_changed => sub {
759 my ($self, $value) = @_; 777 my ($self, $value) = @_;
760 $CFG->{password} = $value; 778 $CFG->{password} = $value;
761 } 779 }
762 ); 780 );
763 781
764 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 782 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
765 $table->add (1, 7, new CFClient::UI::Slider 783 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 784 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 785 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 786 tooltip => "This is the size of the portion of the map update the server sends you. "
769 . "If you set this to a high value you will be able to see further, " 787 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 788 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 789 . "This option is only used once at log-in.",
772 connect_changed => sub { 790 on_changed => sub {
773 my ($self, $value) = @_; 791 my ($self, $value) = @_;
774 792
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 793 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 794 },
777 ); 795 );
… …
784 . "This might increase or create lag, but increases the chances " 802 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 803 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 804 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 805 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 806 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 807 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 808 );
791 809
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 810 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 811 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 812 text => $CFG->{output_count},
795 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 813 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
796 connect_changed => sub { $CFG->{output_count} = $_[1] }, 814 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 815 );
798 816
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 817 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 818 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 819 text => $CFG->{output_sync},
802 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 820 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
803 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 821 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 822 );
805 823
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 824 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 825 expand => 1,
808 align => 0, 826 align => 0,
809 text => "Login", 827 text => "Login",
810 connect_activate => sub { 828 on_activate => sub {
811 $CONN ? stop_game 829 $CONN ? stop_game
812 : start_game; 830 : start_game;
813 }, 831 },
814 ); 832 );
815 833
816 $dialog 834 $dialog
817} 835}
818 836
819sub message_window { 837sub message_window {
820 my $window = new CFClient::UI::FancyFrame 838 my $window = new CFClient::UI::FancyFrame
839 name => "message_window",
821 title => "Messages", 840 title => "Messages",
822 border_bg => [1, 1, 1, 1], 841 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 842 bg => [0, 0, 0, 0.75],
843 x => "max",
844 y => 0,
824 user_w => int $::WIDTH / 3, 845 force_w => $::WIDTH / 3,
825 user_h => int $::HEIGHT / 5, 846 force_h => $::HEIGHT / 5,
826 child => (my $vbox = new CFClient::UI::VBox); 847 child => (my $vbox = new CFClient::UI::VBox);
827 848
828 $vbox->add ($LOGVIEW); 849 $vbox->add ($LOGVIEW);
829 850
830 $vbox->add (my $input = new CFClient::UI::Entry 851 $vbox->add (my $input = new CFClient::UI::Entry
831 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 852 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
832 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 853 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
833 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 854 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
834 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 855 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 856 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 857 my ($input, $prev_focus) = @_;
837 858
838 delete $input->{refocus_map}; 859 delete $input->{refocus_map};
839 860
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 861 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 862 $input->{refocus_map} = 1;
842 } 863 }
843 delete $input->{auto_activated}; 864 delete $input->{auto_activated};
844 }, 865 },
845 connect_activate => sub { 866 on_activate => sub {
846 my ($input, $text) = @_; 867 my ($input, $text) = @_;
847 $input->set_text (''); 868 $input->set_text ('');
848 869
870 if ($text =~ /^\/bind\s+(.*)$/) {
871 CFClient::Binder::open_binding_dialog (sub {
872 my ($mod, $sym) = @_;
873 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
874 });
849 if ($text =~ /^\/(.*)/) { 875 } elsif ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 876 $::CONN->user_send ($1);
851 } else { 877 } else {
852 my $say_cmd = $::CFG->{say_command} || 'say'; 878 my $say_cmd = $::CFG->{say_command} || 'say';
853 $::CONN->user_send ("$say_cmd $text"); 879 $::CONN->user_send ("$say_cmd $text");
854 } 880 }
855 if ($input->{refocus_map}) { 881 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 882 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 883 $MAPWIDGET->focus_in
858 } 884 }
859 }, 885 },
860 connect_escape => sub { 886 on_escape => sub {
861 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
862 }, 888 },
863 ); 889 );
864 890
865 $CONSOLE = { 891 $CONSOLE = {
866 window => $window, 892 window => $window,
867 input => $input 893 input => $input,
868 }; 894 };
869 895
870 $window 896 $window
871} 897}
872 898
873sub open_quit_dialog { 899sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 900 unless ($QUIT_DIALOG) {
875
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 901 $QUIT_DIALOG = new CFClient::UI::FancyFrame
902 x => "center",
903 y => "center",
904 title => "Really Quit?",
905 ;
877 906
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 907 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 908
880 $vb->add (new CFClient::UI::Label 909 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 910 text => "You should find a savebed and apply it first!",
… …
884 ); 913 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 914 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 915 $hb->add (new CFClient::UI::Button
887 text => "Ok", 916 text => "Ok",
888 expand => 1, 917 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 918 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 919 );
891 $hb->add (new CFClient::UI::Button 920 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 921 text => "Quit anyway",
893 expand => 1, 922 expand => 1,
894 connect_activate => sub { exit }, 923 on_activate => sub { exit },
895 ); 924 );
925 }
896 926
897 $QUIT_DIALOG->show_centered; 927 $QUIT_DIALOG->show;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 }
901} 928}
902 929
903sub make_inventory_window { 930sub make_inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 931 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 932 x => "center",
933 y => "center",
934 force_w => $WIDTH * 9/10,
935 force_h => $HEIGHT * 9/10,
936 title => "Inventory",
937 ;
906 938
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 939 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908 940
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 941 $hb->add (my $vb1 = new CFClient::UI::VBox);
910 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 942 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 943 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 944
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 945 $hb->add (my $vb2 = new CFClient::UI::VBox);
946
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 947 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
916 $INVR_LBL->set_text ("Floor"); 948
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 949 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 950
951 # XXX: Call after $INVR = ... because set_opencont sets the items
952 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
953
919 $invwin 954 $invwin
955}
956
957sub make_spell_list {
958 $SPELL_LIST = new CFClient::UI::SpellList
959 force_w => $WIDTH * (9/10),
960 force_h => $HEIGHT * (9/10);
961 $SPELL_LIST
962}
963
964sub make_binding_window {
965 my $binding_list = new CFClient::UI::VBox;
966
967 my $refresh;
968 $refresh = sub {
969 $binding_list->clear ();
970
971 for my $mod (keys %{$::CFG->{bindings}}) {
972 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
973 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
974 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
975
976 my $lbl = join "; ", @$cmds;
977 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
978 $binding_list->add (my $hb = new CFClient::UI::HBox);
979 $hb->add (new CFClient::UI::Button
980 text => "delete",
981 tooltip => "Deletes the binding",
982 on_activate => sub {
983 $binding_list->remove ($hb);
984 delete $::CFG->{bindings}->{$mod}->{$sym};
985 });
986
987 $hb->add (new CFClient::UI::Button
988 text => "edit",
989 tooltip => "Edits the binding",
990 on_activate => sub {
991 $::BIND_EDITOR->set_binding (
992 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
993 sub {
994 my ($nmod, $nsym, $ncmds) = @_;
995 delete $::CFG->{bindings}->{$mod}->{$sym};
996 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
997 $refresh->();
998 $::BIND_WINDOW->show;
999 },
1000 sub {
1001 $::BIND_WINDOW->show;
1002 });
1003 $::BIND_EDITOR->show;
1004 $::BIND_WINDOW->hide;
1005 });
1006
1007 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1008 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1009 }
1010 }
1011 };
1012
1013 $BIND_WINDOW = new CFClient::UI::FancyFrame
1014 title => "Bindings",
1015 x => "center",
1016 y => "center",
1017 def_w => int $WIDTH * 9/10,
1018 def_h => int $HEIGHT * 9/10,
1019 on_visibility_change => sub {
1020 my ($self, $visible) = @_;
1021 $refresh->() if $visible;
1022 };
1023
1024 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1025 $vb->add ($binding_list);
1026 $vb->add (my $hb = new CFClient::UI::HBox);
1027 $hb->add (new CFClient::UI::Button
1028 text => "record new",
1029 expand => 1,
1030 tooltip => "This button opens the binding editor with an empty binding.",
1031 on_activate => sub {
1032 $::BIND_EDITOR->set_binding (undef, undef, [],
1033 sub {
1034 my ($mod, $sym, $cmds) = @_;
1035 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1036 $refresh->();
1037 $::BIND_WINDOW->show;
1038 },
1039 sub {
1040 $::BIND_WINDOW->show;
1041 });
1042 $::BIND_WINDOW->hide;
1043 $::BIND_EDITOR->show;
1044 },
1045 );
1046 $hb->add (new CFClient::UI::Button
1047 text => "close",
1048 tooltip => "Closes the binding window",
1049 expand => 1,
1050 on_activate => sub {
1051 $::BIND_WINDOW->hide;
1052 }
1053 );
1054
1055 $refresh->();
1056 $BIND_WINDOW
920} 1057}
921 1058
922sub make_help_window { 1059sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame 1060 my $win = new CFClient::UI::FancyFrame
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1061 def_w => int $WIDTH * 7/8,
1062 def_h => int $HEIGHT * 7/8,
1063 title => "Documentation";
925 1064
926 $win->add (my $vbox = new CFClient::UI::VBox); 1065 $win->add (my $vbox = new CFClient::UI::VBox);
927 1066
928 $vbox->add (my $buttons = new CFClient::UI::HBox); 1067 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1068 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
936 ) { 1075 ) {
937 my ($pod, $label) = @$_; 1076 my ($pod, $label) = @$_;
938 1077
939 $buttons->add (new CFClient::UI::Button 1078 $buttons->add (new CFClient::UI::Button
940 text => $label, 1079 text => $label,
941 connect_activate => sub { 1080 on_activate => sub {
942 my $parser = new Pod::POM; 1081 my $parser = new Pod::POM;
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1082 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
944 1083
945 $viewer->clear; 1084 $viewer->clear;
946 1085
… …
990 if ($DEBUG_STATUS) { 1129 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1130 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1131 } else {
993 # create the widgets 1132 # create the widgets
994 1133
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1134 $DEBUG_STATUS = new CFClient::UI::Label
1135 padding => 0,
1136 z => 100,
1137 force_x => "max",
1138 force_y => 0;
996 $DEBUG_STATUS->show; 1139 $DEBUG_STATUS->show;
997 1140
1141 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1142
998 $STATUSBOX = new CFClient::UI::Statusbox; 1143 $STATUSBOX = new CFClient::UI::Statusbox;
999 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1144 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1000 1145
1001 (new CFClient::UI::Frame 1146 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1147 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1148 force_x => 0,
1149 force_y => "max",
1004 child => $STATUSBOX, 1150 child => $STATUSBOX,
1005 )->show; 1151 )->show;
1006 1152
1007 CFClient::UI::FancyFrame->new ( 1153 CFClient::UI::FancyFrame->new (
1154 x => 0,
1155 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1156 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1157 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1158 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1011 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1159 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1160 ),
… …
1035 can_hover => 1, 1183 can_hover => 1,
1036 can_events => 1, 1184 can_events => 1,
1037 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1185 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1038 ; 1186 ;
1039 1187
1040 $BUTTONBAR = new CFClient::UI::HBox; 1188 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1041 1189
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1191 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1045 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1193 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1049 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1197 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1050 1198
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1199 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1052 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1200 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1201 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1202 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1203 ."You can also hit the Tab-key to show/hide the Inventory.");
1055 1204
1056 $BUTTONBAR->add (new CFClient::UI::Button 1205 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1206 text => "Save Config",
1058 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1207 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1059 connect_activate => sub { 1208 on_activate => sub {
1209 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1210 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1211 status "Configuration Saved";
1062 }, 1212 },
1063 ); 1213 );
1064 1214
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1215 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066 tooltip => "View Documentation"); 1216 tooltip => "View Documentation");
1067 1217
1218 $BUTTONBAR->add (new CFClient::UI::Flopper
1219 text => "Bindings",
1220 other => make_binding_window,
1221 tooltip =>
1222 "Lets you define, edit and delete bindings."
1223 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1224 ."with nothing set and the recording started. After doing the actions you "
1225 ."want to record press Insert and you will be asked to press a key-combo."
1226 ."After pressing the combo the binding will be saved automatically and the "
1227 ."binding editor closes");
1228
1229 $BUTTONBAR->add (new CFClient::UI::Flopper
1230 text => "Spells",
1231 other => make_spell_list,
1232 tooltip => "The spell list");
1233
1068 $BUTTONBAR->add (new CFClient::UI::Button 1234 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1235 text => "Quit",
1070 tooltip => "Terminates the program", 1236 tooltip => "Terminates the program",
1071 connect_activate => sub { 1237 on_activate => sub {
1072 if ($CONN) { 1238 if ($CONN) {
1073 open_quit_dialog; 1239 open_quit_dialog;
1074 } else { 1240 } else {
1075 exit; 1241 exit;
1076 } 1242 }
1077 }, 1243 },
1078 ); 1244 );
1079 1245
1080 $BUTTONBAR->show; 1246 $BUTTONBAR->show;
1247 $SERVER_SETUP->show;
1081 1248
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1249 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083
1084 # delay till geometry is constant
1085 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087 my $widget = $GAUGES->{win};
1088 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089 });
1090 force_refresh ();
1091 } 1250 }
1092} 1251}
1093 1252
1094sub video_shutdown { 1253sub video_shutdown {
1095 undef $SDL_ACTIVE; 1254 undef $SDL_ACTIVE;
… …
1163 1322
1164my %demo;#d# 1323my %demo;#d#
1165 1324
1166sub force_refresh { 1325sub force_refresh {
1167 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1326 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1168 debug sprintf "%3.2f", $fps; 1327 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1328
1170 $CFClient::UI::ROOT->draw; 1329 $CFClient::UI::ROOT->draw;
1171 1330
1172 $WANT_REFRESH = 0; 1331 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1332 $CAN_REFRESH = 0;
… …
1305############################################################################# 1464#############################################################################
1306 1465
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1466$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1467
1309{ 1468{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1469 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1311 1470
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1471 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1472 CFClient::UI::set_layout ($::CFG->{layout});
1313 1473
1314 my %DEF_CFG = ( 1474 my %DEF_CFG = (
1315 sdl_mode => 0, 1475 sdl_mode => 0,
1316 width => 640, 1476 width => 640,
1317 height => 480, 1477 height => 480,
… …
1394 1554
1395END { CFClient::SDL_Quit } 1555END { CFClient::SDL_Quit }
1396 1556
1397=head1 NAME 1557=head1 NAME
1398 1558
1399pclient - A Crossfire+ and Crossfire game client 1559cfplus - A Crossfire+ and Crossfire game client
1400 1560
1401=head1 SYNOPSIS 1561=head1 SYNOPSIS
1402 1562
1403Just run it - no commandline arguments are supported. 1563Just run it - no commandline arguments are supported.
1404 1564
1405=head1 USAGE 1565=head1 USAGE
1406 1566
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1567cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 1568fullscreen and interactively.
1409 1569
1410=head1 AUTHOR 1570=head1 AUTHOR
1411 1571
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1572Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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