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.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.73 by root, Sat Jun 17 15:07:54 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
89our $SERVER_INFO;
86 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
87our $FLOORBOX; 99our $FLOORBOX;
88our $GAUGES; 100our $GAUGES;
89our $STATWIDS; 101our $STATWIDS;
90 102
91our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
97 109
98our $ALT_ENTER_MESSAGE; 110our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 111our $STATUSBOX;
100our $DEBUG_STATUS; 112our $DEBUG_STATUS;
101 113
114our $INV_WINDOW;
102our $INV; 115our $INV;
103our $INVR; 116our $INVR;
104our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
105 122
106sub status { 123sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 125}
109 126
110sub debug { 127sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 }
161 );
162 $hbox->add (new CFClient::UI::Button
163 text => "Yes",
164 on_activate => sub {
165 $conn->send ("reply y");
166 destroy_query_dialog $conn;
167 },
168 );
169
170 $dialog->focus_in;
171
172 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show;
177
178 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4,
180 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n";
182
183 unshift @dialog, my $table = new CFClient::UI::Table;
184
185 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race",
187 on_activate => sub {
188 $conn->send ("reply n");
189 destroy_query_dialog $conn;
190 },
191 );
192 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept",
194 on_activate => sub {
195 $conn->send ("reply d");
196 destroy_query_dialog $conn;
197 },
198 );
199
200 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, "
210 . "so you can take your time making this important choice."
211 ;
212
213 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat");
216 destroy_query_dialog $conn;
217 return;
218 }
219
220 $STATS_WINDOW->show;
221 $MESSAGE_WINDOW->hide;
222
223 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4,
225 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n";
227
228 unshift @dialog, my $table = new CFClient::UI::Table;
229
230 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again",
233 on_activate => sub {
234 $conn->send ("reply y");
235 destroy_query_dialog $conn;
236 },
237 );
238
239 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
241 value => $_,
242 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
246 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
247 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
248 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250 ],
251 ), 1 .. 2;
252
253 $table->add (2, 0, new CFClient::UI::Button
254 text => "Swap Stats",
255 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn;
259 },
260 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262
263 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept",
266 on_activate => sub {
267 $conn->send ("reply n");
268 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn;
270 },
271 );
272
273 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4,
275 ellipsise => 0,
276 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats "
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281 . "Race selection will influence those values later on."
282 ;
283 }
284
285 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub {
287 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn;
289 },
290 ;
291
292 $entry->focus_in;
293
294 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296
297 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub {
300 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn;
302 },
303 ;
304
305 $entry->focus_in;
306 }
307
308 $vbox->add (@dialog);
309 $dialog->show;
114} 310}
115 311
116sub start_game { 312sub start_game {
117 status "logging in..."; 313 status "logging in...";
314
315 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide;
118 317
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 319
121 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
122 321
… …
134 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 334 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
137 map => $MAP, 336 map => $MAP,
138 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
139 339
140 sound_play => sub { 340 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
142 342
143 $SDL_MIXER 343 $SDL_MIXER
… …
151 }; 351 };
152 352
153 if ($CONN) { 353 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 354 CFClient::lowdelay fileno $CONN->{fh};
155 355
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 356 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 357 } else {
163 status "unable to connect"; 358 status "unable to connect";
164 stop_game(); 359 stop_game();
165 } 360 }
166} 361}
167 362
168sub stop_game { 363sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
369
169 return unless $CONN; 370 return unless $CONN;
170 371
171 status "connection closed"; 372 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 373
374 destroy_query_dialog $CONN;
173 $CONN->destroy; 375 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 377}
179 378
180sub client_setup { 379sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
381
187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 382 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188 383
189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 384 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 386
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 387 $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]);
193 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 388 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194 389
195 $mode_slider->connect (changed => sub { 390 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 391 my ($self, $value) = @_;
197 392
… …
314 on_activate => sub { 509 on_activate => sub {
315 video_shutdown (); 510 video_shutdown ();
316 video_init (); 511 video_init ();
317 } 512 }
318 ); 513 );
514
515 $vbox
516}
517
518sub audio_setup {
519 my $vbox = new CFClient::UI::VBox;
520
521 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
522
523 my $row = 0;
319 524
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
323 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.", 528 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.",
… …
354 audio_shutdown (); 559 audio_shutdown ();
355 audio_init (); 560 audio_init ();
356 } 561 }
357 ); 562 );
358 563
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372} 565}
373 566
374sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
385 578
386sub make_gauge_window { 579sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 580 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 581
389 my $win = new CFClient::UI::Frame ( 582 my $win = new CFClient::UI::Frame (
390 req_x => 0, 583 force_x => 0,
391 req_y => -1, 584 force_y => "max",
392 def_w => $WIDTH, 585 force_w => $WIDTH,
393 def_h => $gh, 586 force_h => $gh,
394 ); 587 );
395 588
396 $win->add (my $hbox = new CFClient::UI::HBox 589 $win->add (my $hbox = new CFClient::UI::HBox
397 children => [ 590 children => [
398 (new CFClient::UI::HBox expand => 1), 591 (new CFClient::UI::HBox expand => 1),
… …
434 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
435 628
436 $win 629 $win
437} 630}
438 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
634
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
643
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645
646 for my $x (0..2) {
647 for my $y (0 .. 2) {
648 $table->add ($x + 3, $y,
649 new CFClient::UI::Entry
650 text => $default_smooth[$x * 3 + $y],
651 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652 );
653 }
654 }
655
656
657 $table
658}
659
439sub make_stats_window { 660sub stats_window {
440 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
441 req_y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
442 req_x => -1, 663 x => "max",
443 title => "Stats", 664 title => "Stats",
444 name => "stats_window"; 665 name => "stats_window";
445 666
446 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
449 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
548 update_stats_window ({}); 769 update_stats_window ({});
549 770
550 $tgw 771 $tgw
551} 772}
552 773
553sub formsep { 774sub formsep($) {
554 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
555} 776}
556 777
557sub update_stats_window { 778sub update_stats_window {
558 my ($stats) = @_; 779 my ($stats) = @_;
559 780
… …
595 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
596 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
597 818
598 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
599 820
600 # TODO: replace by CS_STAT_RES_xxx constants
601 my %tbl = ( 821 my %tbl = (
602 phys => 100, 822 phys => CS_STAT_RES_PHYS,
603 magic => 101, 823 magic => CS_STAT_RES_MAG,
604 fire => 102, 824 fire => CS_STAT_RES_FIRE,
605 elec => 103, 825 elec => CS_STAT_RES_ELEC,
606 cold => 104, 826 cold => CS_STAT_RES_COLD,
607 conf => 105, 827 conf => CS_STAT_RES_CONF,
608 acid => 106, 828 acid => CS_STAT_RES_ACID,
609 drain => 107, 829 drain => CS_STAT_RES_DRAIN,
610 ghit => 108, 830 ghit => CS_STAT_RES_GHOSTHIT,
611 pois => 109, 831 pois => CS_STAT_RES_POISON,
612 slow => 110, 832 slow => CS_STAT_RES_SLOW,
613 para => 111, 833 para => CS_STAT_RES_PARA,
614 tund => 112, 834 tund => CS_STAT_TURN_UNDEAD,
615 fear => 113, 835 fear => CS_STAT_RES_FEAR,
616 depl => 113, 836 depl => CS_STAT_RES_DEPLETE,
617 deat => 115, 837 deat => CS_STAT_RES_DEATH,
618 holyw => 116, 838 holyw => CS_STAT_RES_HOLYWORD,
619 blind => 117, 839 blind => CS_STAT_RES_BLIND,
620 ); 840 );
621 841
622 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623 for keys %tbl; 843 for keys %tbl;
624} 844}
625 845
626sub metaserver_dialog {
627 my $dialog = new CFClient::UI::FancyFrame
628 title => "Server List",
629 child => (my $vbox = new CFClient::UI::VBox);
630
631 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633 $dialog
634}
635
636my $METASERVER_ATIME; 846my $METASERVER_ATIME;
637 847
638sub update_metaserver { 848sub update_metaserver {
639 my ($HOST) = @_;
640
641 return if $METASERVER_ATIME > time; 849 return if $METASERVER_ATIME > time;
642 $METASERVER_ATIME = time + 60; 850 $METASERVER_ATIME = time + 60;
643 851
644 my $table = $METASERVER->{table}; 852 my $table = $METASERVER->{table};
645 $table->clear; 853 $table->clear;
… …
666 874
667 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
668 876
669 $table->clear; 877 $table->clear;
670 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
671 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
672 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
673 for 0 .. $#col; 891 for 0 .. $#col;
674 892
675 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
676 894
677 my $y = 0; 895 my $y = 0;
678 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
695 913
696 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
697 915
698 $y++; 916 $y++;
699 917
700 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
701 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
702 $HOST->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
924 $METASERVER->hide;
925 },
703 }), 926 ),
704 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
705 ]); 928 ]);
706 929
707 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
708 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
709 for 0 .. $#$m; 938 for 0 .. $#$m;
710 } 939 }
711 } 940 }
712 }); 941 });
713} 942}
714 943
715sub server_setup { 944sub metaserver_dialog {
716 my $dialog = new CFClient::UI::FancyFrame 945 my $dialog = new CFClient::UI::FancyFrame
717 x => $WIDTH * (1/3), 946 title => "Server List",
718 y => $HEIGHT * (1/8), 947 name => 'metaserver_dialog',
719 name => "server_setup", 948 x => 'center',
720 title => "Server Setup", 949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
721 child => (my $vbox = new CFClient::UI::VBox), 952 child => (my $vbox = new CFClient::UI::VBox),
722 on_visibility_change => sub { 953 on_visibility_change => sub {
723 my ($self, $visible) = @_; 954 update_metaserver if $_[1];
724 $self->center if $visible;
725 }, 955 },
726 ; 956 ;
727 957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962 $dialog
963}
964
965sub server_setup {
966 my $vbox = new CFClient::UI::VBox;
967
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 968 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 969 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730 970
731 { 971 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 973
734 $vbox->add ( 974 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 975 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 976 expand => 1,
737 text => $CFG->{host}, 977 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 979 on_changed => sub {
740 my ($self, $value) = @_; 980 my ($self, $value) = @_;
… …
742 } 982 }
743 ); 983 );
744 984
745 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
746 986
747 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
748 expand => 1, 988 expand => 1,
749 text => "Server List", 989 text => "Server List",
750 other => $METASERVER, 990 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
754 }
755 ); 994 );
756 } 995 }
757 996
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
… …
776 } 1015 }
777 ); 1016 );
778 1017
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1019 $table->add (1, 7, new CFClient::UI::Slider
781 req_w => 100, 1020 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1021 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1022 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1023 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1024 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1025 . "This option is only used once at log-in.",
… …
826 $CONN ? stop_game 1065 $CONN ? stop_game
827 : start_game; 1066 : start_game;
828 }, 1067 },
829 ); 1068 );
830 1069
831 $dialog 1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1072 text => $CFG->{say_command},
1073 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. "
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub {
1077 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value;
1079 }
1080 );
1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
832} 1092}
833 1093
834sub message_window { 1094sub message_window {
835 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
836 name => "message_window", 1096 name => "message_window",
837 title => "Messages", 1097 title => "Messages",
838 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
839 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
840 req_x => -1, 1100 x => "max",
841 req_y => 0, 1101 y => 0,
842 def_w => int $::WIDTH / 3, 1102 force_w => $::WIDTH * 0.4,
843 def_h => int $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
844 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
845 1105
846 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
847 1107
848 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
… …
880 }, 1140 },
881 ); 1141 );
882 1142
883 $CONSOLE = { 1143 $CONSOLE = {
884 window => $window, 1144 window => $window,
885 input => $input 1145 input => $input,
886 }; 1146 };
887 1147
888 $window 1148 $window
889} 1149}
890 1150
891sub open_quit_dialog { 1151sub open_quit_dialog {
892 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
893 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 ;
894 1159
895 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896 1161
897 $vb->add (new CFClient::UI::Label 1162 $vb->add (new CFClient::UI::Label
898 text => "You should find a savebed and apply it first!", 1163 text => "You should find a savebed and apply it first!",
… …
911 on_activate => sub { exit }, 1176 on_activate => sub { exit },
912 ); 1177 );
913 } 1178 }
914 1179
915 $QUIT_DIALOG->show; 1180 $QUIT_DIALOG->show;
916 $QUIT_DIALOG->center;
917} 1181}
918 1182
1183sub autopickup_setup {
1184 my $table = new CFClient::UI::Table;
1185
1186 for (
1187 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
1193 ["Weapons", 0, 6,
1194 ["All weapons" => PICKUP_ALLWEAPON],
1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1196 ["Bows" => PICKUP_BOW],
1197 ["Arrows" => PICKUP_ARROW],
1198 ],
1199 ["Armour", 0, 12,
1200 ["Helmets" => PICKUP_HELMET],
1201 ["Shields" => PICKUP_SHIELD],
1202 ["Body Armour" => PICKUP_ARMOUR],
1203 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
1208 ["Readables", 2, 2,
1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
1213 ["Misc", 2, 7,
1214 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
1225 )
1226 {
1227 my ($title, $x, $y, @bits) = @$_;
1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1229
1230 for (@bits) {
1231 ++$y;
1232
1233 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask,
1237 on_changed => sub {
1238 my ($box, $value) = @_;
1239
1240 if ($value) {
1241 $::CFG->{pickup} |= $mask;
1242 } else {
1243 $::CFG->{pickup} &= ~$mask;
1244 }
1245
1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN;
1248 });
1249 }
1250 }
1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
919sub make_inventory_window { 1274sub inventory_window {
920 my $invwin = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center",
1277 y => "center",
921 def_w => $WIDTH * 7/8, 1278 force_w => $WIDTH * 9/10,
922 def_h => $HEIGHT * 7/8, 1279 force_h => $HEIGHT * 9/10,
923 title => "Inventory", 1280 title => "Inventory",
924 name => "inventory_window",
925 on_visibility_change => sub {
926 my ($self, $visible) = @_;
927 $self->center if $visible;
928 },
929 ; 1281 ;
930 1282
931 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932 1284
933 $hb->add (my $vb1 = new CFClient::UI::VBox); 1285 $hb->add (my $vb1 = new CFClient::UI::VBox);
934 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936 1288
937 $hb->add (my $vb2 = new CFClient::UI::VBox); 1289 $hb->add (my $vb2 = new CFClient::UI::VBox);
938 1290
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1292
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1294
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299}
1300
1301sub spell_setup {
1302 new CFClient::UI::SpellList
1303}
1304
1305sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox;
1307
1308 my $refresh;
1309 $refresh = sub {
1310 $binding_list->clear ();
1311
1312 for my $mod (keys %{$::CFG->{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316
1317 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button
1321 text => "delete",
1322 tooltip => "Deletes the binding",
1323 on_activate => sub {
1324 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym};
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 });
1349
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 }
1353 }
1354 };
1355
1356 my $vb = new CFClient::UI::VBox;
939 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1357 $vb->add (my $hb = new CFClient::UI::HBox);
940 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 1358 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1359 $hb->add (new CFClient::UI::CheckBox
1360 expand => 1,
1361 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub {
1364 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value;
1366 });
1367
1368 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox);
1370
941 $hb2->add (new CFClient::UI::Button 1371 $hb->add (new CFClient::UI::Button
942 text => "Close", 1372 text => "record new",
943 tooltip => "Close the currently open container (if one is open)", 1373 expand => 1,
1374 tooltip => "This button opens the binding editor with an empty binding.",
944 on_activate => sub { 1375 on_activate => sub {
945 $CONN->send ("apply $CONN->{open_container}") 1376 $::BIND_EDITOR->set_binding (undef, undef, [],
946 if $CONN->{open_container} != 0; 1377 sub {
1378 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1380 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show;
1383 },
1384 sub {
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1387 },
1388 );
1389 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show;
947 }, 1391 },
948 ); 1392 );
949 1393
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1394 $hb->add (new CFClient::UI::Button
1395 text => "close",
1396 tooltip => "Closes the binding window",
1397 expand => 1,
1398 on_activate => sub {
1399 $SETUP_DIALOG->hide;
1400 }
1401 );
951 1402
952 $invwin 1403 $refresh->();
953}
954 1404
1405 $vb
1406}
1407
955sub make_help_window { 1408sub help_window {
956 my $win = new CFClient::UI::FancyFrame 1409 my $win = new CFClient::UI::FancyFrame
1410 x => 'center',
1411 y => 'center',
1412 z => 2,
1413 name => 'doc_browser',
957 def_w => int $WIDTH * 7/8, 1414 force_w => int $WIDTH * 7/8,
958 def_h => int $HEIGHT * 7/8, 1415 force_h => int $HEIGHT * 7/8,
959 title => "Documentation"; 1416 title => "Documentation";
960 1417
961 $win->add (my $vbox = new CFClient::UI::VBox); 1418 $win->add (my $vbox = new CFClient::UI::VBox);
962 1419
963 $vbox->add (my $buttons = new CFClient::UI::HBox); 1420 $vbox->add (my $buttons = new CFClient::UI::HBox);
964 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1422 expand => 1, fontsize => 0.8, padding_x => 4);
965 1423
966 for ( 1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef,
1427 options => [
967 [intro => "Introduction"], 1428 [intro => "Introduction"],
968 [manual => "Manual"], 1429 [manual => "Manual"],
1430 [skill_help => "Skills"],
969 [command_help => "Commands"], 1431 [command_help => "Commands"],
970 [skill_help => "Skills"], 1432 [dmcommand_help => "DM Commands"],
971 ) { 1433 [COPYING => "License Terms"],
972 my ($pod, $label) = @$_; 1434 ],
1435 on_changed => sub {
1436 my ($self, $pod) = @_;
973 1437
974 $buttons->add (new CFClient::UI::Button 1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
975 text => $label, 1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
976 on_activate => sub {
977 my $parser = new Pod::POM;
978 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
979 1440
980 $viewer->clear; 1441 $viewer->clear;
981 1442
982 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983 for @{ CFClient::pod_to_pango_list $pom }; 1444 for @$pom;
984 1445
985 $viewer->set_offset (0); 1446 $viewer->set_offset (0);
986 }, 1447 },
1448 on_visibility_change => sub {
1449 my ($self, $visible) = @_;
1450 return unless $visible;
1451 return if $self->{value};
1452 $self->set_value ("intro");
1453 },
987 ); 1454 );
988 }
989
990 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
991 1455
992 $win 1456 $win
993} 1457}
994 1458
995sub sdl_init { 1459sub sdl_init {
… …
1025 if ($DEBUG_STATUS) { 1489 if ($DEBUG_STATUS) {
1026 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1490 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027 } else { 1491 } else {
1028 # create the widgets 1492 # create the widgets
1029 1493
1030 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1494 $DEBUG_STATUS = new CFClient::UI::Label
1495 padding => 0,
1496 z => 100,
1497 force_x => "max",
1498 force_y => 0;
1031 $DEBUG_STATUS->show; 1499 $DEBUG_STATUS->show;
1032 1500
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1502
1033 $STATUSBOX = new CFClient::UI::Statusbox; 1503 $STATUSBOX = new CFClient::UI::Statusbox;
1034 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1504 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1035 1505
1036 (new CFClient::UI::Frame 1506 (new CFClient::UI::Frame
1037 bg => [0, 0, 0, 0.4], 1507 bg => [0, 0, 0, 0.4],
1038 req_y => -1, 1508 force_x => 0,
1509 force_y => "max",
1039 child => $STATUSBOX, 1510 child => $STATUSBOX,
1040 )->show; 1511 )->show;
1041 1512
1042 CFClient::UI::FancyFrame->new ( 1513 CFClient::UI::FancyFrame->new (
1514 title => "Map",
1515 name => "mapmap",
1516 x => 0,
1517 y => $FONTSIZE + 8,
1043 border_bg => [1, 1, 1, 192/255], 1518 border_bg => [1, 1, 1, 192/255],
1044 bg => [1, 1, 1, 0], 1519 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1045 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047 ), 1523 ),
1048 )->show; 1524 )->show;
1049 1525
… …
1061 } 1537 }
1062 }); 1538 });
1063 $MAPWIDGET->show; 1539 $MAPWIDGET->show;
1064 $MAPWIDGET->focus_in; 1540 $MAPWIDGET->focus_in;
1065 1541
1066 $LOGVIEW = new CFClient::UI::TextView 1542 $LOGVIEW = new CFClient::UI::TextScroller
1067 expand => 1, 1543 expand => 1,
1068 font => $FONT_FIXED, 1544 font => $FONT_FIXED,
1069 fontsize => $::CFG->{log_fontsize}, 1545 fontsize => $::CFG->{log_fontsize},
1546 indent => -4,
1070 can_hover => 1, 1547 can_hover => 1,
1071 can_events => 1, 1548 can_events => 1,
1072 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1549 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073 ; 1550 ;
1074 1551
1075 $BUTTONBAR = new CFClient::UI::HBox; 1552 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1553 title => "Setup",
1554 name => "setup_dialog",
1555 x => 'center',
1556 y => 'center',
1557 z => 2,
1558 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6,
1560 ;
1076 1561
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1566 "Configure the server to play on, your username, password and other server-related options.");
1567 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1568 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings."
1575 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1576 . "with nothing set and the recording started. After doing the actions you "
1577 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask.");
1584
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1078 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1588 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1589
1080 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1590 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1082 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1591 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083 1592
1084 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 1593 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
1085 1594
1086 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1087 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1089 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1598 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1090 1600
1091 $BUTTONBAR->add (new CFClient::UI::Button 1601 $BUTTONBAR->add (new CFClient::UI::Button
1092 text => "Save Config", 1602 text => "Save Config",
1093 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1603 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094 on_activate => sub { 1604 on_activate => sub {
1095 $::CFG->{layout} = CFClient::UI::get_layout; 1605 $::CFG->{layout} = CFClient::UI::get_layout;
1096 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097 status "Configuration Saved"; 1607 status "Configuration Saved";
1098 }, 1608 },
1099 ); 1609 );
1100 1610
1101 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1102 tooltip => "View Documentation"); 1612 tooltip => "View Documentation");
1103 1613
1104 $BUTTONBAR->add (new CFClient::UI::Button 1614 $BUTTONBAR->add (new CFClient::UI::Button
1105 text => "Quit", 1615 text => "Quit",
1106 tooltip => "Terminates the program", 1616 tooltip => "Terminates the program",
… …
1112 } 1622 }
1113 }, 1623 },
1114 ); 1624 );
1115 1625
1116 $BUTTONBAR->show; 1626 $BUTTONBAR->show;
1117 1627 $SETUP_DIALOG->show;
1118 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1121 } 1628 }
1629
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1122} 1631}
1123 1632
1124sub video_shutdown { 1633sub video_shutdown {
1634 CFClient::OpenGL::shutdown;
1635
1125 undef $SDL_ACTIVE; 1636 undef $SDL_ACTIVE;
1126} 1637}
1127 1638
1128my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1639my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1129my $bgmusic;#TODO#hack#d# 1640my $bgmusic;#TODO#hack#d#
… …
1193 1704
1194my %demo;#d# 1705my %demo;#d#
1195 1706
1196sub force_refresh { 1707sub force_refresh {
1197 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1708 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1198 debug sprintf "%3.2f", $fps; 1709 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1199 1710
1200 $CFClient::UI::ROOT->draw; 1711 $CFClient::UI::ROOT->draw;
1201 1712
1202 $WANT_REFRESH = 0; 1713 $WANT_REFRESH = 0;
1203 $CAN_REFRESH = 0; 1714 $CAN_REFRESH = 0;
… …
1258}; 1769};
1259 1770
1260 CFClient::SDL_GL_SwapBuffers; 1771 CFClient::SDL_GL_SwapBuffers;
1261} 1772}
1262 1773
1263my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1774my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1264 $NOW = time; 1775 $NOW = time;
1265 1776
1266 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1777 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1267 for CFClient::SDL_PollEvent; 1778 for CFClient::SDL_PollEvent;
1268 1779
… …
1335############################################################################# 1846#############################################################################
1336 1847
1337$SIG{INT} = $SIG{TERM} = sub { exit }; 1848$SIG{INT} = $SIG{TERM} = sub { exit };
1338 1849
1339{ 1850{
1340 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1851 local $SIG{__DIE__} = sub {
1852 return unless defined $^S && !$^S;
1853 Carp::confess $_[1];#d#TODO: remove when stable
1854 CFClient::fatal $_[0];
1855 };
1341 1856
1342 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1857 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1343 CFClient::UI::set_layout ($::CFG->{layout}); 1858 CFClient::UI::set_layout ($::CFG->{layout});
1344 1859
1345 my %DEF_CFG = ( 1860 my %DEF_CFG = (
1346 sdl_mode => 0, 1861 sdl_mode => 0,
1347 width => 640, 1862 width => 640,
… …
1351 map_scale => 1, 1866 map_scale => 1,
1352 fow_enable => 1, 1867 fow_enable => 1,
1353 fow_intensity => 0.45, 1868 fow_intensity => 0.45,
1354 fow_smooth => 0, 1869 fow_smooth => 0,
1355 gui_fontsize => 1, 1870 gui_fontsize => 1,
1356 log_fontsize => 1, 1871 log_fontsize => 0.7,
1357 gauge_fontsize=> 1, 1872 gauge_fontsize=> 1,
1358 gauge_size => 0.35, 1873 gauge_size => 0.35,
1359 stat_fontsize => 1, 1874 stat_fontsize => 0.7,
1360 mapsize => 100, 1875 mapsize => 100,
1361 host => "crossfire.schmorp.de", 1876 host => "crossfire.schmorp.de",
1362 say_command => 'say', 1877 say_command => 'say',
1363 audio_enable => 1, 1878 audio_enable => 1,
1364 bgm_enable => 1, 1879 bgm_enable => 1,
1365 bgm_volume => 0.25, 1880 bgm_volume => 0.25,
1366 face_prefetch => 0, 1881 face_prefetch => 0,
1367 output_sync => 1, 1882 output_sync => 1,
1368 output_count => 1, 1883 output_count => 1,
1884 pickup => 0,
1369 ); 1885 );
1370 1886
1371 while (my ($k, $v) = each %DEF_CFG) { 1887 while (my ($k, $v) = each %DEF_CFG) {
1372 $CFG->{$k} = $v unless exists $CFG->{$k}; 1888 $CFG->{$k} = $v unless exists $CFG->{$k};
1373 } 1889 }
… …
1420 video_init; 1936 video_init;
1421 audio_init; 1937 audio_init;
1422} 1938}
1423 1939
1424Event::loop; 1940Event::loop;
1941#CFClient::SDL_Quit;
1942#CFClient::_exit 0;
1425 1943
1426END { CFClient::SDL_Quit } 1944END { CFClient::SDL_Quit }
1427 1945
1428=head1 NAME 1946=head1 NAME
1429 1947
1430pclient - A Crossfire+ and Crossfire game client 1948cfplus - A Crossfire+ and Crossfire game client
1431 1949
1432=head1 SYNOPSIS 1950=head1 SYNOPSIS
1433 1951
1434Just run it - no commandline arguments are supported. 1952Just run it - no commandline arguments are supported.
1435 1953
1436=head1 USAGE 1954=head1 USAGE
1437 1955
1438Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1956cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1439fullscreen and interactively. 1957fullscreen and interactively.
1440 1958
1959=head1 DEBUGGING
1960
1961
1962CFPLUS_DEBUG - environment variable
1963
1964 1 draw borders around widgets
1965 2 add low-level widget info to tooltips
1966 4 show fps
1967 8 suppress tooltips
1968
1441=head1 AUTHOR 1969=head1 AUTHOR
1442 1970
1443Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1971Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1444 1972
1445 1973

Diff Legend

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