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.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.56 by root, Mon Jun 5 05:23:21 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
… …
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
44$Event::DIED = sub { 43$Event::DIED = sub {
45 # TODO: display dialog box or so 44 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 46 CFClient::error $_[1];
47}; 47};
48 48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 50
… …
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;
87
88our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK;
90our $SETUP_SERVER;
91our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
86 93
87our $FLOORBOX; 94our $FLOORBOX;
88our $GAUGES; 95our $GAUGES;
89our $STATWIDS; 96our $STATWIDS;
90 97
… …
97 104
98our $ALT_ENTER_MESSAGE; 105our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 106our $STATUSBOX;
100our $DEBUG_STATUS; 107our $DEBUG_STATUS;
101 108
109our $INV_WINDOW;
102our $INV; 110our $INV;
103our $INVR; 111our $INVR;
104our $INVR_LBL; 112our $INV_RIGHT_HB;
113
114our $BIND_EDITOR;
115
116our $PICKUP_CFG;
105 117
106sub status { 118sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 120}
109 121
110sub debug { 122sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 123 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 124}
115 125
116sub start_game { 126sub start_game {
117 status "logging in..."; 127 status "logging in...";
128
129 $LOGIN_BUTTON->set_text ("Logout");
130 $SETUP_DIALOG->hide;
118 131
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 132 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 133
121 my ($host, $port) = split /:/, $CFG->{host}; 134 my ($host, $port) = split /:/, $CFG->{host};
122 135
… …
151 }; 164 };
152 165
153 if ($CONN) { 166 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 167 CFClient::lowdelay fileno $CONN->{fh};
155 168
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 169 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 170 } else {
163 status "unable to connect"; 171 status "unable to connect";
164 stop_game(); 172 stop_game();
165 } 173 }
166} 174}
167 175
168sub stop_game { 176sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181
169 return unless $CONN; 182 return unless $CONN;
170 183
171 status "connection closed"; 184 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 185
173 $CONN->destroy; 186 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 187 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 188}
179 189
180sub client_setup { 190sub 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); 191 my $vbox = new CFClient::UI::VBox;
192
187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188 194
189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 197
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 198 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 199 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194 200
195 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 202 my ($self, $value) = @_;
197 203
… …
314 on_activate => sub { 320 on_activate => sub {
315 video_shutdown (); 321 video_shutdown ();
316 video_init (); 322 video_init ();
317 } 323 }
318 ); 324 );
325
326 $vbox
327}
328
329sub audio_setup {
330 my $vbox = new CFClient::UI::VBox;
331
332 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
333
334 my $row = 0;
319 335
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 337 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 338 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.", 339 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 (); 370 audio_shutdown ();
355 audio_init (); 371 audio_init ();
356 } 372 }
357 ); 373 );
358 374
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 375 $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} 376}
373 377
374sub set_stats_window_fontsize { 378sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 379 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 380 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
385 389
386sub make_gauge_window { 390sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 391 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 392
389 my $win = new CFClient::UI::Frame ( 393 my $win = new CFClient::UI::Frame (
390 req_y => -1, 394 force_x => 0,
395 force_y => "max",
391 user_w => $WIDTH, 396 force_w => $WIDTH,
392 user_h => $gh, 397 force_h => $gh,
393 ); 398 );
394 399
395 $win->add (my $hbox = new CFClient::UI::HBox 400 $win->add (my $hbox = new CFClient::UI::HBox
396 children => [ 401 children => [
397 (new CFClient::UI::HBox expand => 1), 402 (new CFClient::UI::HBox expand => 1),
… …
433 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
434 439
435 $win 440 $win
436} 441}
437 442
443
438sub make_stats_window { 444sub make_stats_window {
439 my $tgw = new CFClient::UI::FancyFrame 445 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8), 446 y => $HEIGHT * (2/8),
441 req_x => -1, 447 x => "max",
442 title => "Stats", 448 title => "Stats",
443 name => "stats_window"; 449 name => "stats_window";
444 450
445 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
446 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447 can_hover => 1, can_events => 1, 453 can_hover => 1, can_events => 1,
448 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
547 update_stats_window ({}); 553 update_stats_window ({});
548 554
549 $tgw 555 $tgw
550} 556}
551 557
552sub formsep { 558sub formsep($) {
553 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
554} 560}
555 561
556sub update_stats_window { 562sub update_stats_window {
557 my ($stats) = @_; 563 my ($stats) = @_;
558 564
… …
620 626
621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622 for keys %tbl; 628 for keys %tbl;
623} 629}
624 630
625sub metaserver_dialog {
626 my $dialog = new CFClient::UI::FancyFrame
627 title => "Server List",
628 child => (my $vbox = new CFClient::UI::VBox);
629
630 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632 $dialog
633}
634
635my $METASERVER_ATIME; 631my $METASERVER_ATIME;
636 632
637sub update_metaserver { 633sub update_metaserver {
638 my ($HOST) = @_;
639
640 return if $METASERVER_ATIME > time; 634 return if $METASERVER_ATIME > time;
641 $METASERVER_ATIME = time + 60; 635 $METASERVER_ATIME = time + 60;
642 636
643 my $table = $METASERVER->{table}; 637 my $table = $METASERVER->{table};
644 $table->clear; 638 $table->clear;
… …
696 690
697 $y++; 691 $y++;
698 692
699 $table->add (0, $y, new CFClient::UI::VBox children => [ 693 $table->add (0, $y, new CFClient::UI::VBox children => [
700 (new CFClient::UI::Button text => "Use", on_activate => sub { 694 (new CFClient::UI::Button text => "Use", on_activate => sub {
701 $HOST->set_text ($CFG->{host} = $host); 695 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility;
702 }), 697 }),
703 (new CFClient::UI::Empty expand => 1), 698 (new CFClient::UI::Empty expand => 1),
704 ]); 699 ]);
705 700
706 $table->add ($_ + 1, $y, new CFClient::UI::Label 701 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
709 } 704 }
710 } 705 }
711 }); 706 });
712} 707}
713 708
709sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List",
712 name => 'metaserver_dialog',
713 x => 'center',
714 y => 'center',
715 child => (my $vbox = new CFClient::UI::VBox),
716 on_visibility_change => sub {
717 update_metaserver if $_[1];
718 },
719 ;
720
721 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
722
723 $dialog
724}
725
714sub server_setup { 726sub server_setup {
715 my $dialog = new CFClient::UI::FancyFrame 727 my $vbox = new CFClient::UI::VBox;
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
719 title => "Server Setup",
720 child => (my $vbox = new CFClient::UI::VBox),
721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724 728
725 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
726 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727 731
728 { 732 {
729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730 734
731 $vbox->add ( 735 $vbox->add (
732 my $HOST = new CFClient::UI::Entry 736 $HOST_ENTRY = new CFClient::UI::Entry
733 expand => 1, 737 expand => 1,
734 text => $CFG->{host}, 738 text => $CFG->{host},
735 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736 on_changed => sub { 740 on_changed => sub {
737 my ($self, $value) = @_; 741 my ($self, $value) = @_;
… …
739 } 743 }
740 ); 744 );
741 745
742 $METASERVER = metaserver_dialog; 746 $METASERVER = metaserver_dialog;
743 747
744 $vbox->add (new CFClient::UI::Flopper 748 $vbox->add (new CFClient::UI::Button
745 expand => 1, 749 expand => 1,
746 text => "Server List", 750 text => "Server List",
747 other => $METASERVER, 751 other => $METASERVER,
748 tooltip => "Show a list of available crossfire servers", 752 tooltip => "Show a list of available crossfire servers",
749 on_open => sub { 753 on_activate => sub { $METASERVER->toggle_visibility },
750 update_metaserver $HOST;
751 }
752 ); 754 );
753 } 755 }
754 756
755 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 757 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756 $table->add (1, 4, new CFClient::UI::Entry 758 $table->add (1, 4, new CFClient::UI::Entry
… …
773 } 775 }
774 ); 776 );
775 777
776 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 778 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777 $table->add (1, 7, new CFClient::UI::Slider 779 $table->add (1, 7, new CFClient::UI::Slider
778 req_w => 100, 780 force_w => 100,
779 range => [$CFG->{mapsize}, 10, 100, 0, 1], 781 range => [$CFG->{mapsize}, 10, 100, 0, 1],
780 tooltip => "This is the size of the portion of the map update the server sends you. " 782 tooltip => "This is the size of the portion of the map update the server sends you. "
781 . "If you set this to a high value you will be able to see further, " 783 . "If you set this to a high value you will be able to see further, "
782 . "but you also increase bandwidth requirements and latency. " 784 . "but you also increase bandwidth requirements and latency. "
783 . "This option is only used once at log-in.", 785 . "This option is only used once at log-in.",
… …
823 $CONN ? stop_game 825 $CONN ? stop_game
824 : start_game; 826 : start_game;
825 }, 827 },
826 ); 828 );
827 829
828 $dialog 830 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
831 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
832 text => $CFG->{say_command},
833 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. "
834 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
835 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
836 on_changed => sub {
837 my ($self, $value) = @_;
838 $CFG->{say_command} = $value;
839 }
840 );
841
842 $vbox
829} 843}
830 844
831sub message_window { 845sub message_window {
832 my $window = new CFClient::UI::FancyFrame 846 my $window = new CFClient::UI::FancyFrame
833 name => "message_window", 847 name => "message_window",
834 title => "Messages", 848 title => "Messages",
835 border_bg => [1, 1, 1, 1], 849 border_bg => [1, 1, 1, 1],
836 bg => [0, 0, 0, 0.75], 850 bg => [0, 0, 0, 0.75],
837 req_x => -1, 851 x => "max",
852 y => 0,
838 user_w => int $::WIDTH / 3, 853 force_w => $::WIDTH / 3,
839 user_h => int $::HEIGHT / 5, 854 force_h => $::HEIGHT / 5,
840 child => (my $vbox = new CFClient::UI::VBox); 855 child => (my $vbox = new CFClient::UI::VBox);
841 856
842 $vbox->add ($LOGVIEW); 857 $vbox->add ($LOGVIEW);
843 858
844 $vbox->add (my $input = new CFClient::UI::Entry 859 $vbox->add (my $input = new CFClient::UI::Entry
… …
876 }, 891 },
877 ); 892 );
878 893
879 $CONSOLE = { 894 $CONSOLE = {
880 window => $window, 895 window => $window,
881 input => $input 896 input => $input,
882 }; 897 };
883 898
884 $window 899 $window
885} 900}
886 901
887sub open_quit_dialog { 902sub open_quit_dialog {
888 unless ($QUIT_DIALOG) { 903 unless ($QUIT_DIALOG) {
889
890 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 904 $QUIT_DIALOG = new CFClient::UI::FancyFrame
905 x => "center",
906 y => "center",
907 z => 50,
908 title => "Really Quit?",
909 ;
891 910
892 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893 912
894 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
895 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
905 $hb->add (new CFClient::UI::Button 924 $hb->add (new CFClient::UI::Button
906 text => "Quit anyway", 925 text => "Quit anyway",
907 expand => 1, 926 expand => 1,
908 on_activate => sub { exit }, 927 on_activate => sub { exit },
909 ); 928 );
929 }
910 930
911 $QUIT_DIALOG->show_centered; 931 $QUIT_DIALOG->show;
912 } else { 932}
913 $QUIT_DIALOG->show_centered; 933
934sub autopickup_setup {
935 my $table = new CFClient::UI::Table;
936
937 for (
938 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
944 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
950 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958
959 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
964 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
975 )
914 } 976 {
977 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979
980 for (@bits) {
981 ++$y;
982
983 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask,
987 on_changed => sub {
988 my ($box, $value) = @_;
989 if ($value) {
990 $::CFG->{pickup} |= $mask;
991 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
993 }
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 });
997 }
998 }
999
1000 $table
915} 1001}
916 1002
917sub make_inventory_window { 1003sub make_inventory_window {
918 my $invwin = new CFClient::UI::FancyFrame 1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1005 x => "center",
1006 y => "center",
919 user_w => $WIDTH * (7/8), 1007 force_w => $WIDTH * 9/10,
920 user_h => $HEIGHT * (7/8), 1008 force_h => $HEIGHT * 9/10,
921 title => "Inventory", 1009 title => "Inventory",
922 name => "inventory_window", 1010 ;
923 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1]
925 };
926 1011
927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
928 1013
929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1014 $hb->add (my $vb1 = new CFClient::UI::VBox);
930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
931 $lbl->set_text ("Player");
932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933 1017
934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1018 $hb->add (my $vb2 = new CFClient::UI::VBox);
935 1019
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1021
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028}
1029
1030sub spell_setup {
1031 new CFClient::UI::SpellList
1032}
1033
1034sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox;
1036
1037 my $refresh;
1038 $refresh = sub {
1039 $binding_list->clear ();
1040
1041 for my $mod (keys %{$::CFG->{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045
1046 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button
1050 text => "delete",
1051 tooltip => "Deletes the binding",
1052 on_activate => sub {
1053 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym};
1055 });
1056
1057 $hb->add (new CFClient::UI::Button
1058 text => "edit",
1059 tooltip => "Edits the binding",
1060 on_activate => sub {
1061 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1063 sub {
1064 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show;
1070 },
1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show;
1074 });
1075 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide;
1077 });
1078
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 }
1082 }
1083 };
1084
1085 my $vb = new CFClient::UI::VBox;
1086 $vb->add ($binding_list);
936 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1087 $vb->add (my $hb = new CFClient::UI::HBox);
937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1088
938 $hb2->add (new CFClient::UI::Button 1089 $hb->add (new CFClient::UI::Button
939 text => "Close", 1090 text => "record new",
940 tooltip => "Close the currently open container (if one is open)", 1091 expand => 1,
1092 tooltip => "This button opens the binding editor with an empty binding.",
941 on_activate => sub { 1093 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}") 1094 $::BIND_EDITOR->set_binding (undef, undef, [],
943 if $CONN->{open_container} != 0; 1095 sub {
1096 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1098 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1101 },
1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1105 },
1106 );
1107 $SETUP_DIALOG->hide;
1108 $::BIND_EDITOR->show;
944 }, 1109 },
945 ); 1110 );
946 1111
947 $INVR_LBL->set_text ("Floor"); 1112 $hb->add (new CFClient::UI::Button
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1113 text => "close",
1114 tooltip => "Closes the binding window",
1115 expand => 1,
1116 on_activate => sub {
1117 $SETUP_DIALOG->hide;
1118 }
1119 );
949 1120
950 $invwin 1121 $refresh->();
1122
1123 $vb
951} 1124}
952 1125
953sub make_help_window { 1126sub make_help_window {
954 my $win = new CFClient::UI::FancyFrame 1127 my $win = new CFClient::UI::FancyFrame
955 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1128 x => 'center',
1129 y => 'center',
1130 z => 2,
1131 name => 'doc_browser',
1132 force_w => int $WIDTH * 7/8,
1133 force_h => int $HEIGHT * 7/8,
1134 title => "Documentation";
956 1135
957 $win->add (my $vbox = new CFClient::UI::VBox); 1136 $win->add (my $vbox = new CFClient::UI::VBox);
958 1137
959 $vbox->add (my $buttons = new CFClient::UI::HBox); 1138 $vbox->add (my $buttons = new CFClient::UI::HBox);
960 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1139 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
968 my ($pod, $label) = @$_; 1147 my ($pod, $label) = @$_;
969 1148
970 $buttons->add (new CFClient::UI::Button 1149 $buttons->add (new CFClient::UI::Button
971 text => $label, 1150 text => $label,
972 on_activate => sub { 1151 on_activate => sub {
973 my $parser = new Pod::POM;
974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1152 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";
975 1153
976 $viewer->clear; 1154 $viewer->clear;
977 1155
978 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1156 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
979 for @{ CFClient::pod_to_pango_list $pom }; 1157 for @{ CFClient::pod_to_pango_list $pom };
… …
1021 if ($DEBUG_STATUS) { 1199 if ($DEBUG_STATUS) {
1022 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1200 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023 } else { 1201 } else {
1024 # create the widgets 1202 # create the widgets
1025 1203
1026 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1204 $DEBUG_STATUS = new CFClient::UI::Label
1205 padding => 0,
1206 z => 100,
1207 force_x => "max",
1208 force_y => 0;
1027 $DEBUG_STATUS->show; 1209 $DEBUG_STATUS->show;
1028 1210
1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1212
1029 $STATUSBOX = new CFClient::UI::Statusbox; 1213 $STATUSBOX = new CFClient::UI::Statusbox;
1030 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1031 1215
1032 (new CFClient::UI::Frame 1216 (new CFClient::UI::Frame
1033 bg => [0, 0, 0, 0.4], 1217 bg => [0, 0, 0, 0.4],
1034 req_y => -1, 1218 force_x => 0,
1219 force_y => "max",
1035 child => $STATUSBOX, 1220 child => $STATUSBOX,
1036 )->show; 1221 )->show;
1037 1222
1038 CFClient::UI::FancyFrame->new ( 1223 CFClient::UI::FancyFrame->new (
1224 title => "Map",
1225 name => "mapmap",
1226 x => 0,
1227 y => $FONTSIZE + 8,
1039 border_bg => [1, 1, 1, 192/255], 1228 border_bg => [1, 1, 1, 192/255],
1040 bg => [1, 1, 1, 0], 1229 bg => [1, 1, 1, 0],
1041 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1230 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1042 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1231 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043 ), 1232 ),
… …
1066 can_hover => 1, 1255 can_hover => 1,
1067 can_events => 1, 1256 can_events => 1,
1068 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069 ; 1258 ;
1070 1259
1260 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1261 title => "Setup",
1262 name => "setup_dialog",
1263 x => 'center',
1264 y => 'center',
1265 z => 2,
1266 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6,
1268 ;
1269
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1272
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings."
1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1290
1071 $BUTTONBAR = new CFClient::UI::HBox; 1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072 1292
1073 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1074 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1294 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1075 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1295
1076 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1078 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1079 1298
1080 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 1299 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
1081 1300
1082 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1083 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1084 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1085 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1086 1306
1087 $BUTTONBAR->add (new CFClient::UI::Button 1307 $BUTTONBAR->add (new CFClient::UI::Button
1088 text => "Save Config", 1308 text => "Save Config",
1089 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1090 on_activate => sub { 1310 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout; 1311 $::CFG->{layout} = CFClient::UI::get_layout;
1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093 status "Configuration Saved"; 1313 status "Configuration Saved";
1094 }, 1314 },
1095 ); 1315 );
1096 1316
1097 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1108 } 1328 }
1109 }, 1329 },
1110 ); 1330 );
1111 1331
1112 $BUTTONBAR->show; 1332 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show;
1334 }
1113 1335
1114 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1115
1116 # delay till geometry is constant
1117 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119 my $widget = $GAUGES->{win};
1120 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121 });
1122 force_refresh ();
1123 }
1124} 1337}
1125 1338
1126sub video_shutdown { 1339sub video_shutdown {
1127 undef $SDL_ACTIVE; 1340 undef $SDL_ACTIVE;
1128} 1341}
… …
1195 1408
1196my %demo;#d# 1409my %demo;#d#
1197 1410
1198sub force_refresh { 1411sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1412 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1413 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1414
1202 $CFClient::UI::ROOT->draw; 1415 $CFClient::UI::ROOT->draw;
1203 1416
1204 $WANT_REFRESH = 0; 1417 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1418 $CAN_REFRESH = 0;
… …
1260}; 1473};
1261 1474
1262 CFClient::SDL_GL_SwapBuffers; 1475 CFClient::SDL_GL_SwapBuffers;
1263} 1476}
1264 1477
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1478my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 1479 $NOW = time;
1267 1480
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1481 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1482 for CFClient::SDL_PollEvent;
1270 1483
… …
1337############################################################################# 1550#############################################################################
1338 1551
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1552$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1553
1341{ 1554{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1555 local $SIG{__DIE__} = sub {
1556 return unless defined $^S && !$^S;
1557 Carp::confess $_[1];#d#TODO: remove when stable
1558 CFClient::fatal $_[0];
1559 };
1343 1560
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1562 CFClient::UI::set_layout ($::CFG->{layout});
1346 1563
1347 my %DEF_CFG = ( 1564 my %DEF_CFG = (
1348 sdl_mode => 0, 1565 sdl_mode => 0,
1349 width => 640, 1566 width => 640,
… …
1427 1644
1428END { CFClient::SDL_Quit } 1645END { CFClient::SDL_Quit }
1429 1646
1430=head1 NAME 1647=head1 NAME
1431 1648
1432pclient - A Crossfire+ and Crossfire game client 1649cfplus - A Crossfire+ and Crossfire game client
1433 1650
1434=head1 SYNOPSIS 1651=head1 SYNOPSIS
1435 1652
1436Just run it - no commandline arguments are supported. 1653Just run it - no commandline arguments are supported.
1437 1654
1438=head1 USAGE 1655=head1 USAGE
1439 1656
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1657cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1658fullscreen and interactively.
1442 1659
1660=head1 DEBUGGING
1661
1662
1663CFPLUS_DEBUG - environment variable
1664
1665 1 draw borders around widgets
1666 2 add low-level widget info to tooltips
1667 4 show fps
1668 8 suppress tooltips
1669
1443=head1 AUTHOR 1670=head1 AUTHOR
1444 1671
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1672Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1673
1447 1674

Diff Legend

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