ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.48 by root, Fri Jun 2 21:46:45 2006 UTC

… …
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 $HOST_ENTRY;
87our $SERVER_SETUP;
86 88
87our $FLOORBOX; 89our $FLOORBOX;
88our $GAUGES; 90our $GAUGES;
89our $STATWIDS; 91our $STATWIDS;
90 92
… …
97 99
98our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 101our $STATUSBOX;
100our $DEBUG_STATUS; 102our $DEBUG_STATUS;
101 103
104our $INV_WINDOW;
102our $INV; 105our $INV;
103our $INVR; 106our $INVR;
104our $INVR_LBL; 107our $INV_RIGHT_HB;
108
109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113our $PICKUP_CFG;
105 114
106sub status { 115sub status {
107 $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]);
108} 117}
109 118
110sub debug { 119sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 120 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 121}
115 122
116sub start_game { 123sub start_game {
117 status "logging in..."; 124 status "logging in...";
125
126 $LOGIN_BUTTON->set_text ("Logout");
127 $SERVER_SETUP->hide;
118 128
119 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;
120 130
121 my ($host, $port) = split /:/, $CFG->{host}; 131 my ($host, $port) = split /:/, $CFG->{host};
122 132
… …
151 }; 161 };
152 162
153 if ($CONN) { 163 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 164 CFClient::lowdelay fileno $CONN->{fh};
155 165
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 166 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 167 } else {
163 status "unable to connect"; 168 status "unable to connect";
164 stop_game(); 169 stop_game();
165 } 170 }
166} 171}
167 172
168sub stop_game { 173sub stop_game {
174 $LOGIN_BUTTON->set_text ("Login");
175 $SERVER_SETUP->show;
176 $INV_WINDOW->hide;
177 $LOGVIEW->hide;
178
169 return unless $CONN; 179 return unless $CONN;
170 180
171 status "connection closed"; 181 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 182
173 $CONN->destroy; 183 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 184 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 185}
179 186
180sub client_setup { 187sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 188 my $dialog = new CFClient::UI::FancyFrame
189 x => 1,
190 y => $HEIGHT * (1/8),
182 name => "client_setup", 191 name => "client_setup",
183 title => "Client Setup", 192 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 193 child => (my $vbox = new CFClient::UI::VBox);
194
185 $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]);
186 196
187 $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");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 198 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 199
190 $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]);
191 $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");
192 202
193 $mode_slider->connect (changed => sub { 203 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 204 my ($self, $value) = @_;
195 205
… …
202 212
203 $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");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 214 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 215 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 216 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 217 on_changed => sub {
208 my ($self, $value) = @_; 218 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 219 $CFG->{fullscreen} = $value;
210 } 220 }
211 ); 221 );
212 222
213 $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");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 225 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 226 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 227 on_changed => sub {
218 my ($self, $value) = @_; 228 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 229 $CFG->{fast} = $value;
220 } 230 }
221 ); 231 );
222 232
223 $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");
224 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 237 on_changed => sub {
228 my ($self, $value) = @_; 238 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 239 $CFG->{map_scale} = 2 ** $value;
230 } 240 }
231 ); 241 );
232 242
233 $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");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 244 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 245 state => $CFG->{fow_enable},
236 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.",
237 connect_changed => sub { 247 on_changed => sub {
238 my ($self, $value) = @_; 248 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 249 $CFG->{fow_enable} = $value;
240 } 250 }
241 ); 251 );
242 252
243 $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");
244 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 255 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.", 256 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 { 257 on_changed => sub {
248 my ($self, $value) = @_; 258 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 259 $CFG->{fow_intensity} = $value;
250 } 260 }
251 ); 261 );
252 262
253 $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");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 264 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 265 state => $CFG->{fow_smooth},
256 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.",
257 connect_changed => sub { 267 on_changed => sub {
258 my ($self, $value) = @_; 268 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 269 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 271 }
262 ); 272 );
263 273
264 $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");
265 $table->add (1, $row++, new CFClient::UI::Slider 275 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 276 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.", 277 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] }, 278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 279 );
270 280
271 $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");
272 $table->add (1, $row++, new CFClient::UI::Slider 282 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 283 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.", 284 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]) }, 285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 286 );
277 287
278 $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");
279 289
280 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 291 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.", 292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 293 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 294 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 295 &set_stats_window_fontsize;
286 } 296 }
287 ); 297 );
288 298
289 $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");
290 $table->add (1, $row++, new CFClient::UI::Slider 300 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 301 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.", 302 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 303 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 304 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 305 &set_gauge_window_fontsize;
296 } 306 }
297 ); 307 );
298 308
299 $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");
300 $table->add (1, $row++, new CFClient::UI::Slider 310 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 311 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 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.",
303 connect_changed => sub { 313 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 314 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 316 }
307 ); 317 );
308 318
309 $table->add (1, $row++, new CFClient::UI::Button 319 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 320 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 321 tooltip => "Apply the video settings",
312 connect_activate => sub { 322 on_activate => sub {
313 video_shutdown (); 323 video_shutdown ();
314 video_init (); 324 video_init ();
315 } 325 }
316 ); 326 );
317 327
318 $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");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 329 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 330 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.", 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.",
322 connect_changed => sub { 332 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 333 $CFG->{audio_enable} = $_[1];
324 } 334 }
325 ); 335 );
326# $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");
327# $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 {
328# $CFG->{effects_volume} = $_[1]; 338# $CFG->{effects_volume} = $_[1];
329# }); 339# });
330 $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");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 341 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 342 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 343 expand => 1, state => $CFG->{bgm_enable},
334 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.",
335 connect_changed => sub { 345 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 346 $CFG->{bgm_enable} = $_[1];
337 } 347 }
338 ); 348 );
339 $hbox->add (new CFClient::UI::Slider 349 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 350 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 351 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 352 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 353 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 354 CFClient::MixMusic::volume $_[1] * 128;
345 } 355 }
346 ); 356 );
347 357
348 $table->add (1, $row++, new CFClient::UI::Button 358 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 359 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 360 tooltip => "Apply the audio settings",
351 connect_activate => sub { 361 on_activate => sub {
352 audio_shutdown (); 362 audio_shutdown ();
353 audio_init (); 363 audio_init ();
354 } 364 }
355 ); 365 );
356 366
… …
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 368 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command}, 369 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. " 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. "
361 . "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. "
362 . "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.",
363 connect_changed => sub { 373 on_changed => sub {
364 my ($self, $value) = @_; 374 my ($self, $value) = @_;
365 $CFG->{say_command} = $value; 375 $CFG->{say_command} = $value;
366 } 376 }
367 ); 377 );
368 378
… …
383 393
384sub make_gauge_window { 394sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 395 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 396
387 my $win = new CFClient::UI::Frame ( 397 my $win = new CFClient::UI::Frame (
388 req_y => -1, 398 force_x => 0,
399 force_y => "max",
389 user_w => $WIDTH, 400 force_w => $WIDTH,
390 user_h => $gh, 401 force_h => $gh,
391 ); 402 );
392 403
393 $win->add (my $hbox = new CFClient::UI::HBox 404 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 405 children => [
395 (new CFClient::UI::HBox expand => 1), 406 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 442 &set_gauge_window_fontsize;
432 443
433 $win 444 $win
434} 445}
435 446
447
436sub make_stats_window { 448sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 449 my $tgw = new CFClient::UI::FancyFrame
450 y => $HEIGHT * (2/8),
451 x => "max",
452 title => "Stats",
453 name => "stats_window";
438 454
439 $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);
440 $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,
441 can_hover => 1, can_events => 1, 457 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."); 458 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
541 update_stats_window ({}); 557 update_stats_window ({});
542 558
543 $tgw 559 $tgw
544} 560}
545 561
546sub formsep { 562sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 563 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 564}
549 565
550sub update_stats_window { 566sub update_stats_window {
551 my ($stats) = @_; 567 my ($stats) = @_;
552 568
… …
614 630
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 632 for keys %tbl;
617} 633}
618 634
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627}
628
629my $METASERVER_ATIME; 635my $METASERVER_ATIME;
630 636
631sub update_metaserver { 637sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 638 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 639 $METASERVER_ATIME = time + 60;
636 640
637 my $table = $METASERVER->{table}; 641 my $table = $METASERVER->{table};
638 $table->clear; 642 $table->clear;
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 693 $m = [$users, $host, $uptime, $version, $desc];
690 694
691 $y++; 695 $y++;
692 696
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 697 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 698 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 699 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility;
696 }), 701 }),
697 (new CFClient::UI::Empty expand => 1), 702 (new CFClient::UI::Empty expand => 1),
698 ]); 703 ]);
699 704
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 705 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
703 } 708 }
704 } 709 }
705 }); 710 });
706} 711}
707 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
708sub server_setup { 730sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
732 x => "center",
733 y => "center",
710 name => "server_setup", 734 name => "server_setup",
711 title => "Server Setup", 735 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 736 child => (my $vbox = new CFClient::UI::VBox),
713 737 ;
738
714 $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]);
715 $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");
716 741
717 { 742 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 744
720 $vbox->add ( 745 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 746 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 747 expand => 1,
723 text => $CFG->{host}, 748 text => $CFG->{host},
724 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",
725 connect_changed => sub { 750 on_changed => sub {
726 my ($self, $value) = @_; 751 my ($self, $value) = @_;
727 $CFG->{host} = $value; 752 $CFG->{host} = $value;
728 } 753 }
729 ); 754 );
730 755
731 $METASERVER = metaserver_dialog; 756 $METASERVER = metaserver_dialog;
732 757
733 $vbox->add (new CFClient::UI::Flopper 758 $vbox->add (new CFClient::UI::Button
734 expand => 1, 759 expand => 1,
735 text => "Server List", 760 text => "Server List",
736 other => $METASERVER, 761 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 762 tooltip => "Show a list of available crossfire servers",
738 connect_open => sub { 763 on_activate => sub { $METASERVER->toggle_visibility },
739 update_metaserver $HOST;
740 }
741 ); 764 );
742 } 765 }
743 766
744 $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");
745 $table->add (1, 4, new CFClient::UI::Entry 768 $table->add (1, 4, new CFClient::UI::Entry
746 text => $CFG->{user}, 769 text => $CFG->{user},
747 tooltip => "The name of your character on the server", 770 tooltip => "The name of your character on the server",
748 connect_changed => sub { 771 on_changed => sub {
749 my ($self, $value) = @_; 772 my ($self, $value) = @_;
750 $CFG->{user} = $value; 773 $CFG->{user} = $value;
751 } 774 }
752 ); 775 );
753 776
754 $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");
755 $table->add (1, 5, new CFClient::UI::Entry 778 $table->add (1, 5, new CFClient::UI::Entry
756 text => $CFG->{password}, 779 text => $CFG->{password},
757 hidden => 1, 780 hidden => 1,
758 tooltip => "The password for your character", 781 tooltip => "The password for your character",
759 connect_changed => sub { 782 on_changed => sub {
760 my ($self, $value) = @_; 783 my ($self, $value) = @_;
761 $CFG->{password} = $value; 784 $CFG->{password} = $value;
762 } 785 }
763 ); 786 );
764 787
765 $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");
766 $table->add (1, 7, new CFClient::UI::Slider 789 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 790 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 791 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 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. "
770 . "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, "
771 . "but you also increase bandwidth requirements and latency. " 794 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 795 . "This option is only used once at log-in.",
773 connect_changed => sub { 796 on_changed => sub {
774 my ($self, $value) = @_; 797 my ($self, $value) = @_;
775 798
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 799 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 }, 800 },
778 ); 801 );
… …
785 . "This might increase or create lag, but increases the chances " 808 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 809 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 810 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 811 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 812 . "This option can be set and unset any time.",
790 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 813 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
791 ); 814 );
792 815
793 $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");
794 $table->add (1, 9, new CFClient::UI::Entry 817 $table->add (1, 9, new CFClient::UI::Entry
795 text => $CFG->{output_count}, 818 text => $CFG->{output_count},
796 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 819 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
797 connect_changed => sub { $CFG->{output_count} = $_[1] }, 820 on_changed => sub { $CFG->{output_count} = $_[1] },
798 ); 821 );
799 822
800 $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");
801 $table->add (1, 10, new CFClient::UI::Entry 824 $table->add (1, 10, new CFClient::UI::Entry
802 text => $CFG->{output_sync}, 825 text => $CFG->{output_sync},
803 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 826 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
804 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 827 on_changed => sub { $CFG->{output_sync} = $_[1] },
805 ); 828 );
806 829
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 830 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
808 expand => 1, 831 expand => 1,
809 align => 0, 832 align => 0,
810 text => "Login", 833 text => "Login",
811 connect_activate => sub { 834 on_activate => sub {
812 $CONN ? stop_game 835 $CONN ? stop_game
813 : start_game; 836 : start_game;
814 }, 837 },
815 ); 838 );
816 839
… …
821 my $window = new CFClient::UI::FancyFrame 844 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 845 name => "message_window",
823 title => "Messages", 846 title => "Messages",
824 border_bg => [1, 1, 1, 1], 847 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 848 bg => [0, 0, 0, 0.75],
849 x => "max",
850 y => 0,
826 user_w => int $::WIDTH / 3, 851 force_w => $::WIDTH / 3,
827 user_h => int $::HEIGHT / 5, 852 force_h => $::HEIGHT / 5,
828 child => (my $vbox = new CFClient::UI::VBox); 853 child => (my $vbox = new CFClient::UI::VBox);
829 854
830 $vbox->add ($LOGVIEW); 855 $vbox->add ($LOGVIEW);
831 856
832 $vbox->add (my $input = new CFClient::UI::Entry 857 $vbox->add (my $input = new CFClient::UI::Entry
833 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> "
834 . "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>...). "
835 . "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). "
836 . "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.",
837 connect_focus_in => sub { 862 on_focus_in => sub {
838 my ($input, $prev_focus) = @_; 863 my ($input, $prev_focus) = @_;
839 864
840 delete $input->{refocus_map}; 865 delete $input->{refocus_map};
841 866
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 867 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 868 $input->{refocus_map} = 1;
844 } 869 }
845 delete $input->{auto_activated}; 870 delete $input->{auto_activated};
846 }, 871 },
847 connect_activate => sub { 872 on_activate => sub {
848 my ($input, $text) = @_; 873 my ($input, $text) = @_;
849 $input->set_text (''); 874 $input->set_text ('');
850 875
851 if ($text =~ /^\/(.*)/) { 876 if ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 877 $::CONN->user_send ($1);
… …
857 if ($input->{refocus_map}) { 882 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 883 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 884 $MAPWIDGET->focus_in
860 } 885 }
861 }, 886 },
862 connect_escape => sub { 887 on_escape => sub {
863 $MAPWIDGET->focus_in 888 $MAPWIDGET->focus_in
864 }, 889 },
865 ); 890 );
866 891
867 $CONSOLE = { 892 $CONSOLE = {
868 window => $window, 893 window => $window,
869 input => $input 894 input => $input,
870 }; 895 };
871 896
872 $window 897 $window
873} 898}
874 899
875sub open_quit_dialog { 900sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 901 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 902 $QUIT_DIALOG = new CFClient::UI::FancyFrame
903 x => "center",
904 y => "center",
905 title => "Really Quit?",
906 ;
879 907
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 908 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 909
882 $vb->add (new CFClient::UI::Label 910 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 911 text => "You should find a savebed and apply it first!",
… …
886 ); 914 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 915 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 916 $hb->add (new CFClient::UI::Button
889 text => "Ok", 917 text => "Ok",
890 expand => 1, 918 expand => 1,
891 connect_activate => sub { $QUIT_DIALOG->hide }, 919 on_activate => sub { $QUIT_DIALOG->hide },
892 ); 920 );
893 $hb->add (new CFClient::UI::Button 921 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 922 text => "Quit anyway",
895 expand => 1, 923 expand => 1,
896 connect_activate => sub { exit }, 924 on_activate => sub { exit },
897 ); 925 );
926 }
898 927
899 $QUIT_DIALOG->show_centered; 928 $QUIT_DIALOG->show;
929}
930
931sub make_pickup_cfg_window {
932 $PICKUP_CFG = new CFClient::UI::FancyFrame
933 title => "Autopickup configuration",
934 x => "center",
935 y => "center",
936 force_w => $WIDTH * 6/10,
937 force_h => $HEIGHT * 9/10;
938
939
940 $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
941 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
942 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
943 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
944 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
945
946 my $tbl = 0;
947 my $tblrow = 0;
948
949 for (
950 ["General", $gen_tbl],
951 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
952 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
953 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
954 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
955 ["Weapons", $ltbl],
956 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
957 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
958 ["Bows" => CFClient::Pickup::PU_BOW],
959 ["Arrows" => CFClient::Pickup::PU_ARROW],
960 ["Armour"],
961 ["Helmets" => CFClient::Pickup::PU_HELMET],
962 ["Shields" => CFClient::Pickup::PU_SHIELD],
963 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
964 ["Boots" => CFClient::Pickup::PU_BOOTS],
965 ["Gloves" => CFClient::Pickup::PU_GLOVES],
966 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
967 ["Readables", $rtbl],
968 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
969 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
970 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
971 ["Misc"],
972 ["Food" => CFClient::Pickup::PU_FOOD],
973 ["Drinks" => CFClient::Pickup::PU_DRINK],
974 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
975 ["Keys" => CFClient::Pickup::PU_KEY],
976 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
977 ["Potions" => CFClient::Pickup::PU_POTION],
978 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
979 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
980 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
981 )
982 {
983 if (ref $_->[1]) {
984 $tbl = $_->[1];
985 $tblrow = 0;
986 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
987 } elsif (not defined $_->[1]) {
988 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
900 } else { 989 } else {
901 $QUIT_DIALOG->show_centered; 990 my $mask = $_->[1];
991 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
992 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
993 state => $CFG->{pickup} & $mask,
994 on_changed => sub {
995 my ($box, $value) = @_;
996 if ($value) {
997 $::CFG->{pickup} |= $mask;
998 } else {
999 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1000 }
1001 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1002 if defined $::CONN;
1003 });
1004 }
902 } 1005 }
1006
1007 $PICKUP_CFG
903} 1008}
904 1009
905sub make_inventory_window { 1010sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 1011 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 1012 x => "center",
1013 y => "center",
1014 force_w => $WIDTH * 9/10,
1015 force_h => $HEIGHT * 9/10,
1016 title => "Inventory",
1017 ;
908 1018
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1019 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 1020
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1021 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1022 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1023 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 1024
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1025 $hb->add (my $vb2 = new CFClient::UI::VBox);
1026
1027 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1028
1029 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1030
1031 # XXX: Call after $INVR = ... because set_opencont sets the items
1032 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1033
1034 $invwin
1035}
1036
1037sub make_spell_list {
1038 $SPELL_LIST = new CFClient::UI::SpellList
1039 force_w => $WIDTH * (9/10),
1040 force_h => $HEIGHT * (9/10);
1041 $SPELL_LIST
1042}
1043
1044sub make_binding_window {
1045 my $binding_list = new CFClient::UI::VBox;
1046
1047 my $refresh;
1048 $refresh = sub {
1049 $binding_list->clear ();
1050
1051 for my $mod (keys %{$::CFG->{bindings}}) {
1052 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1053 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1054 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1055
1056 my $lbl = join "; ", @$cmds;
1057 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1058 $binding_list->add (my $hb = new CFClient::UI::HBox);
1059 $hb->add (new CFClient::UI::Button
1060 text => "delete",
1061 tooltip => "Deletes the binding",
1062 on_activate => sub {
1063 $binding_list->remove ($hb);
1064 delete $::CFG->{bindings}->{$mod}->{$sym};
1065 });
1066
1067 $hb->add (new CFClient::UI::Button
1068 text => "edit",
1069 tooltip => "Edits the binding",
1070 on_activate => sub {
1071 $::BIND_EDITOR->set_binding (
1072 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1073 sub {
1074 my ($nmod, $nsym, $ncmds) = @_;
1075 delete $::CFG->{bindings}->{$mod}->{$sym};
1076 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1077 $refresh->();
1078 $::BIND_WINDOW->show;
1079 },
1080 sub {
1081 $::BIND_WINDOW->show;
1082 });
1083 $::BIND_EDITOR->show;
1084 $::BIND_WINDOW->hide;
1085 });
1086
1087 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1088 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1089 }
1090 }
1091 };
1092
1093 $BIND_WINDOW = new CFClient::UI::FancyFrame
1094 title => "Bindings",
1095 x => "center",
1096 y => "center",
1097 def_w => int $WIDTH * 9/10,
1098 def_h => int $HEIGHT * 9/10,
1099 on_visibility_change => sub {
1100 my ($self, $visible) = @_;
1101 $refresh->() if $visible;
1102 };
1103
1104 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1105 $vb->add ($binding_list);
917 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1106 $vb->add (my $hb = new CFClient::UI::HBox);
918 $hb2->add (new CFClient::UI::Button 1107 $hb->add (new CFClient::UI::Button
919 text => "Close", 1108 text => "record new",
920 tooltip => "Close the currently open container (if one is open)", 1109 expand => 1,
1110 tooltip => "This button opens the binding editor with an empty binding.",
921 connect_activate => sub { 1111 on_activate => sub {
922 $CONN->send ("apply $CONN->{open_container}") 1112 $::BIND_EDITOR->set_binding (undef, undef, [],
923 if $CONN->{open_container} != 0; 1113 sub {
1114 my ($mod, $sym, $cmds) = @_;
1115 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1116 $refresh->();
1117 $::BIND_WINDOW->show;
1118 },
1119 sub {
1120 $::BIND_WINDOW->show;
1121 });
1122 $::BIND_WINDOW->hide;
1123 $::BIND_EDITOR->show;
924 }, 1124 },
925 ); 1125 );
926 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0); 1126 $hb->add (new CFClient::UI::Button
1127 text => "close",
1128 tooltip => "Closes the binding window",
1129 expand => 1,
1130 on_activate => sub {
1131 $::BIND_WINDOW->hide;
1132 }
1133 );
927 1134
928 $INVR_LBL->set_text ("Floor"); 1135 $refresh->();
929 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1136 $BIND_WINDOW
930
931 $invwin
932} 1137}
933 1138
934sub make_help_window { 1139sub make_help_window {
935 my $win = new CFClient::UI::FancyFrame 1140 my $win = new CFClient::UI::FancyFrame
936 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1141 x => 'center',
1142 y => 'center',
1143 name => 'doc_browser',
1144 force_w => int $WIDTH * 7/8,
1145 force_h => int $HEIGHT * 7/8,
1146 title => "Documentation";
937 1147
938 $win->add (my $vbox = new CFClient::UI::VBox); 1148 $win->add (my $vbox = new CFClient::UI::VBox);
939 1149
940 $vbox->add (my $buttons = new CFClient::UI::HBox); 1150 $vbox->add (my $buttons = new CFClient::UI::HBox);
941 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1151 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
948 ) { 1158 ) {
949 my ($pod, $label) = @$_; 1159 my ($pod, $label) = @$_;
950 1160
951 $buttons->add (new CFClient::UI::Button 1161 $buttons->add (new CFClient::UI::Button
952 text => $label, 1162 text => $label,
953 connect_activate => sub { 1163 on_activate => sub {
954 my $parser = new Pod::POM; 1164 my $parser = new Pod::POM;
955 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1165 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
956 1166
957 $viewer->clear; 1167 $viewer->clear;
958 1168
… …
1002 if ($DEBUG_STATUS) { 1212 if ($DEBUG_STATUS) {
1003 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1213 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1004 } else { 1214 } else {
1005 # create the widgets 1215 # create the widgets
1006 1216
1007 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1217 $DEBUG_STATUS = new CFClient::UI::Label
1218 padding => 0,
1219 z => 100,
1220 force_x => "max",
1221 force_y => 0;
1008 $DEBUG_STATUS->show; 1222 $DEBUG_STATUS->show;
1009 1223
1224 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1225
1010 $STATUSBOX = new CFClient::UI::Statusbox; 1226 $STATUSBOX = new CFClient::UI::Statusbox;
1011 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1227 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1012 1228
1013 (new CFClient::UI::Frame 1229 (new CFClient::UI::Frame
1014 bg => [0, 0, 0, 0.4], 1230 bg => [0, 0, 0, 0.4],
1015 req_y => -1, 1231 force_x => 0,
1232 force_y => "max",
1016 child => $STATUSBOX, 1233 child => $STATUSBOX,
1017 )->show; 1234 )->show;
1018 1235
1019 CFClient::UI::FancyFrame->new ( 1236 CFClient::UI::FancyFrame->new (
1237 title => "Map",
1238 name => "mapmap",
1239 x => 0,
1240 y => $FONTSIZE + 8,
1020 border_bg => [1, 1, 1, 192/255], 1241 border_bg => [1, 1, 1, 192/255],
1021 bg => [1, 1, 1, 0], 1242 bg => [1, 1, 1, 0],
1022 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1243 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1023 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1244 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1024 ), 1245 ),
… …
1047 can_hover => 1, 1268 can_hover => 1,
1048 can_events => 1, 1269 can_events => 1,
1049 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1270 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1050 ; 1271 ;
1051 1272
1052 $BUTTONBAR = new CFClient::UI::HBox; 1273 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1053 1274
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1275 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1055 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1276 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1056 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1057 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1278 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1061 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1282 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1062 1283
1063 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1284 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1064 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1285 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1286 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1066 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1287 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1288 ."You can also hit the Tab-key to show/hide the Inventory.");
1067 1289
1068 $BUTTONBAR->add (new CFClient::UI::Button 1290 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Save Config", 1291 text => "Save Config",
1070 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1292 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1071 connect_activate => sub { 1293 on_activate => sub {
1072 $::CFG->{layout} = CFClient::UI::get_layout; 1294 $::CFG->{layout} = CFClient::UI::get_layout;
1073 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1295 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1074 status "Configuration Saved"; 1296 status "Configuration Saved";
1075 }, 1297 },
1076 ); 1298 );
1077 1299
1078 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1079 tooltip => "View Documentation"); 1301 tooltip => "View Documentation");
1080 1302
1303 $BUTTONBAR->add (new CFClient::UI::Flopper
1304 text => "Bindings",
1305 other => make_binding_window,
1306 tooltip =>
1307 "Lets you define, edit and delete bindings."
1308 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1309 ."with nothing set and the recording started. After doing the actions you "
1310 ."want to record press Insert and you will be asked to press a key-combo."
1311 ."After pressing the combo the binding will be saved automatically and the "
1312 ."binding editor closes");
1313
1314 $BUTTONBAR->add (new CFClient::UI::Flopper
1315 text => "Spells",
1316 other => make_spell_list,
1317 tooltip => "The spell list");
1318
1319 $BUTTONBAR->add (new CFClient::UI::Flopper
1320 text => "Pickup",
1321 other => make_pickup_cfg_window,
1322 tooltip => "The pickup dialog");
1323
1324
1081 $BUTTONBAR->add (new CFClient::UI::Button 1325 $BUTTONBAR->add (new CFClient::UI::Button
1082 text => "Quit", 1326 text => "Quit",
1083 tooltip => "Terminates the program", 1327 tooltip => "Terminates the program",
1084 connect_activate => sub { 1328 on_activate => sub {
1085 if ($CONN) { 1329 if ($CONN) {
1086 open_quit_dialog; 1330 open_quit_dialog;
1087 } else { 1331 } else {
1088 exit; 1332 exit;
1089 } 1333 }
1090 }, 1334 },
1091 ); 1335 );
1092 1336
1093 $BUTTONBAR->show; 1337 $BUTTONBAR->show;
1338 $SERVER_SETUP->show;
1094 1339
1095 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1096
1097 # delay till geometry is constant
1098 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1099 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1100 my $widget = $GAUGES->{win};
1101 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1102 });
1103 force_refresh ();
1104 } 1341 }
1105} 1342}
1106 1343
1107sub video_shutdown { 1344sub video_shutdown {
1108 undef $SDL_ACTIVE; 1345 undef $SDL_ACTIVE;
… …
1176 1413
1177my %demo;#d# 1414my %demo;#d#
1178 1415
1179sub force_refresh { 1416sub force_refresh {
1180 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1417 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1181 debug sprintf "%3.2f", $fps; 1418 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1182 1419
1183 $CFClient::UI::ROOT->draw; 1420 $CFClient::UI::ROOT->draw;
1184 1421
1185 $WANT_REFRESH = 0; 1422 $WANT_REFRESH = 0;
1186 $CAN_REFRESH = 0; 1423 $CAN_REFRESH = 0;
… …
1318############################################################################# 1555#############################################################################
1319 1556
1320$SIG{INT} = $SIG{TERM} = sub { exit }; 1557$SIG{INT} = $SIG{TERM} = sub { exit };
1321 1558
1322{ 1559{
1323 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1560 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1324 1561
1325 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1326 CFClient::UI::set_layout ($::CFG->{layout}); 1563 CFClient::UI::set_layout ($::CFG->{layout});
1327 1564
1328 my %DEF_CFG = ( 1565 my %DEF_CFG = (
1329 sdl_mode => 0, 1566 sdl_mode => 0,
1330 width => 640, 1567 width => 640,
… …
1408 1645
1409END { CFClient::SDL_Quit } 1646END { CFClient::SDL_Quit }
1410 1647
1411=head1 NAME 1648=head1 NAME
1412 1649
1413pclient - A Crossfire+ and Crossfire game client 1650cfplus - A Crossfire+ and Crossfire game client
1414 1651
1415=head1 SYNOPSIS 1652=head1 SYNOPSIS
1416 1653
1417Just run it - no commandline arguments are supported. 1654Just run it - no commandline arguments are supported.
1418 1655
1419=head1 USAGE 1656=head1 USAGE
1420 1657
1421Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1658cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1422fullscreen and interactively. 1659fullscreen and interactively.
1423 1660
1661=head1 DEBUGGING
1662
1663
1664CFPLUS_DEBUG - environment variable
1665
1666 1 draw borders around widgets
1667 2 add low-level widget info to tooltips
1668 4 show fps
1669 8 suppress tooltips
1670
1424=head1 AUTHOR 1671=head1 AUTHOR
1425 1672
1426Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1427 1674
1428 1675

Diff Legend

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