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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44 45
45$Event::DIED = sub { 46$Event::DIED = sub {
… …
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
88our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
89our $SERVER_INFO; 91our $SERVER_INFO;
90 92
91our $SETUP_DIALOG; 93our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 94our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 95our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 96our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 97
98our $PL_NOTEBOOK;
97our $STATS_WINDOW; 99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 106our $MESSAGE_WINDOW;
99our $FLOORBOX; 107our $FLOORBOX;
100our $GAUGES; 108our $GAUGES;
101our $STATWIDS; 109our $STATWIDS;
102 110
… …
109 117
110our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 119our $STATUSBOX;
112our $DEBUG_STATUS; 120our $DEBUG_STATUS;
113 121
114our $INV_WINDOW;
115our $INV; 122our $INV;
116our $INVR; 123our $INVR;
117our $INV_RIGHT_HB; 124our $INV_RIGHT_HB;
118 125
119our $BIND_EDITOR; 126our $BIND_EDITOR;
127our $BIND_UPD_CB;
120 128
121our $PICKUP_CFG; 129our $PICKUP_CFG;
122 130
123sub status { 131sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
219 $conn->send ("reply $stat"); 227 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 228 destroy_query_dialog $conn;
221 return; 229 return;
222 } 230 }
223 231
224 $STATS_WINDOW->show; 232 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 233 $MESSAGE_WINDOW->hide;
226 234
227 unshift @dialog, new CFClient::UI::Label 235 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 236 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 237 ellipsise => 0,
… …
269 # right: accept 277 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 278 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 279 text => "Accept",
272 on_activate => sub { 280 on_activate => sub {
273 $conn->send ("reply n"); 281 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 282 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
276 0 284 0
277 }, 285 },
278 ); 286 );
279 287
… …
324 $LOGIN_BUTTON->set_text ("Logout"); 332 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 333 $SETUP_DIALOG->hide;
326 334
327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 335 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
328 336
329 my ($host, $port) = split /:/, $CFG->{host}; 337 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
330 338
331 $MAP = new CFClient::Map $mapsize, $mapsize; 339 $MAP = new CFClient::Map $mapsize, $mapsize;
332 340
333 $CONN = eval { 341 $CONN = eval {
334 new CFClient::Protocol 342 new CFClient::Protocol
335 host => $host, 343 host => $host,
336 port => $port || 13327, 344 port => $port || 13327,
337 user => $CFG->{user}, 345 user => $CFG->{profile}{default}{user},
338 pass => $CFG->{password}, 346 pass => $CFG->{profile}{default}{password},
339 mapw => $mapsize, 347 mapw => $mapsize,
340 maph => $mapsize, 348 maph => $mapsize,
341 349
342 map_widget => $MAPWIDGET, 350 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW, 351 logview => $LOGVIEW,
… …
371 379
372sub stop_game { 380sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 381 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 382 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 383 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 384 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 385 $SPELL_PAGE->clear_spells;
378 386
379 return unless $CONN; 387 return unless $CONN;
380 388
381 status "connection closed"; 389 status "connection closed";
382 390
383 destroy_query_dialog $CONN; 391 destroy_query_dialog $CONN;
384 $CONN->destroy; 392 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 393 $CONN = 0; # false, does not autovivify
394
395 undef $MAP;
386} 396}
387 397
388sub graphics_setup { 398sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 399 my $vbox = new CFClient::UI::VBox;
390 400
… …
649 659
650 $table 660 $table
651} 661}
652 662
653sub stats_window { 663sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 664 my $tgw =
655 y => $HEIGHT * (2/8), 665 new CFClient::UI::Window
656 x => "max", 666 child => my $vb = new CFClient::UI::VBox;
657 title => "Stats",
658 name => "stats_window",
659 has_close_button => 1;
660 667
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
662 $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,
663 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
664 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.");
665 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
… …
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
691 697
692 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 698 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
693 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 699 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
694 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 700 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
695 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 701 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
696 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 702 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
697 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 703 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
698 ) { 704 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 705 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
700 706
… …
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 727 pois => "<b>Poison</b> (resistance to getting poisoned)",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
723 deat => "<b>Death</b> (resistance against death spells)", 729 deat => "<b>Death</b> (resistance against death spells)",
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
726 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 732 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
746 ); 752 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 754 font => $FONT_FIXED,
749 can_hover => 1, 755 can_hover => 1,
750 can_events => 1, 756 can_events => 1,
751 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_},
753 ); 759 );
754 760
755 $row++; 761 $row++;
756 if ($row % 6 == 0) { 762 if ($row % 6 == 0) {
… …
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $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});
812 818
813 $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);
814 820
… …
838} 844}
839 845
840my $METASERVER_ATIME; 846my $METASERVER_ATIME;
841 847
842sub update_metaserver { 848sub update_metaserver {
849 my ($metaserver_dialog) = @_;
850
851 $METASERVER = $metaserver_dialog
852 if defined $metaserver_dialog;
853
843 return if $METASERVER_ATIME > time; 854 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 855 $METASERVER_ATIME = time + 60;
845 856
846 my $table = $METASERVER->{table}; 857 my $table = $METASERVER->{table};
847 $table->clear; 858 $table->clear;
… …
912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 923 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
913 (new CFClient::UI::Button 924 (new CFClient::UI::Button
914 text => "Use", 925 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field", 926 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub { 927 on_activate => sub {
917 $HOST_ENTRY->set_text ($CFG->{host} = $host); 928 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
918 $METASERVER->hide; 929 $METASERVER->hide;
919 0 930 0
920 }, 931 },
921 ), 932 ),
922 (new CFClient::UI::Empty expand => 1), 933 (new CFClient::UI::Empty expand => 1),
… …
935 } 946 }
936 }); 947 });
937} 948}
938 949
939sub metaserver_dialog { 950sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox;
952 my $table = new CFClient::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
954
940 my $dialog = new CFClient::UI::FancyFrame 955 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 956 title => "Server List",
942 name => 'metaserver_dialog', 957 name => 'metaserver_dialog',
943 x => 'center', 958 x => 'center',
944 y => 'center', 959 y => 'center',
945 z => 3, 960 z => 3,
946 force_h => $::HEIGHT * 0.4, 961 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 962 child => $vbox,
963 has_close_button => 1,
964 table => $table,
948 on_visibility_change => sub { 965 on_visibility_change => sub {
949 update_metaserver if $_[1]; 966 update_metaserver ($_[0]) if $_[1];
950 0 967 0
951 }, 968 },
952 ; 969 ;
953 970
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957
958 $dialog 971 $dialog
959} 972}
960 973
961sub server_setup { 974sub server_setup {
962 my $vbox = new CFClient::UI::VBox; 975 my $vbox = new CFClient::UI::VBox;
… …
968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 981 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
969 982
970 $vbox->add ( 983 $vbox->add (
971 $HOST_ENTRY = new CFClient::UI::Entry 984 $HOST_ENTRY = new CFClient::UI::Entry
972 expand => 1, 985 expand => 1,
973 text => $CFG->{host}, 986 text => $CFG->{profile}{default}{host},
974 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 987 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
975 on_changed => sub { 988 on_changed => sub {
976 my ($self, $value) = @_; 989 my ($self, $value) = @_;
977 $CFG->{host} = $value; 990 $CFG->{profile}{default}{host} = $value;
978 0 991 0
979 } 992 }
980 ); 993 );
981
982 $METASERVER = metaserver_dialog;
983 994
984 $vbox->add (new CFClient::UI::Button 995 $vbox->add (new CFClient::UI::Button
985 expand => 1, 996 expand => 1,
986 text => "Server List", 997 text => "Server List",
987 other => $METASERVER, 998 other => $METASERVER,
… …
991 ); 1002 );
992 } 1003 }
993 1004
994 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1005 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
995 $table->add (1, 4, new CFClient::UI::Entry 1006 $table->add (1, 4, new CFClient::UI::Entry
996 text => $CFG->{user}, 1007 text => $CFG->{profile}{default}{user},
997 tooltip => "The name of your character on the server", 1008 tooltip => "The name of your character on the server",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 } 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
999 ); 1010 );
1000 1011
1001 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1012 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1002 $table->add (1, 5, new CFClient::UI::Entry 1013 $table->add (1, 5, new CFClient::UI::Entry
1003 text => $CFG->{password}, 1014 text => $CFG->{profile}{default}{password},
1004 hidden => 1, 1015 hidden => 1,
1005 tooltip => "The password for your character", 1016 tooltip => "The password for your character",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 } 1017 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1007 ); 1018 );
1008 1019
1009 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1020 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1010 $table->add (1, 7, new CFClient::UI::Slider 1021 $table->add (1, 7, new CFClient::UI::Slider
1011 force_w => 100, 1022 force_w => 100,
… …
1179sub autopickup_setup { 1190sub autopickup_setup {
1180 my $table = new CFClient::UI::Table; 1191 my $table = new CFClient::UI::Table;
1181 1192
1182 for ( 1193 for (
1183 ["General", 0, 0, 1194 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1197 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1198 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1199 ],
1189 ["Weapons", 0, 6, 1200 ["Weapons", 0, 6,
… …
1226 for (@bits) { 1237 for (@bits) {
1227 ++$y; 1238 ++$y;
1228 1239
1229 my $mask = $_->[1]; 1240 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1244 on_changed => sub {
1234 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1235 1246
1236 if ($value) { 1247 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1248 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1253 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1254 if defined $::CONN;
1244 1255
1245 0 1256 0
1246 }); 1257 });
1258
1259 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1260 }
1248 } 1261 }
1249 1262
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1263 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1266 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1267 on_changed => sub {
1254 my ($slider, $value) = @_; 1268 my ($slider, $value) = @_;
1255 1269
1256 $::CFG->{pickup} &= ~0x7; 1270 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1271 $::CFG->{pickup} |= int $value
1258 if $value; 1272 if $value;
1259 1; 1273 1;
1260 }); 1274 });
1275
1261 $table->add (3, 18, new CFClient::UI::Button 1276 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1277 text => "set",
1263 on_activate => sub { 1278 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1280 if defined $::CONN;
… …
1267 }); 1282 });
1268 1283
1269 $table 1284 $table
1270} 1285}
1271 1286
1272sub inventory_window { 1287sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1;
1289
1290 $hb->add (my $vb1 = new CFClient::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1292 $vb1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1319 x => "center",
1275 y => "center", 1320 y => "center",
1276 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1323 title => "Player",
1279 has_close_button => 1, 1324 has_close_button => 1
1280 ; 1325 ;
1281 1326
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1327 my $ntb =
1328 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook
1330 expand => 1,
1331 debug => 1,
1332 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1333 ;
1283 1334
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1335 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1338 );
1339 $ntb->add (
1340 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1341 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1342 );
1343 $ntb->add (
1344 Inventory => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1346 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 );
1287 1348
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289 1349
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1350 $plwin->add ($ntb);
1291 1351 $plwin
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $invwin
1298} 1352}
1299 1353
1300sub spell_setup { 1354sub update_bindings {
1301 new CFClient::UI::SpellList 1355 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1356}
1303 1357
1304sub keyboard_setup { 1358sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1359 my $binding_list = new CFClient::UI::VBox;
1306 1360
1307 my $refresh; 1361 my $refresh;
1308 $refresh = sub { 1362 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1363 $binding_list->clear ();
1310 1364
1311 for my $mod (keys %{$::CFG->{bindings}}) { 1365 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1366 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1367 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1368 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1369
1316 my $lbl = join "; ", @$cmds; 1370 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1371 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1372 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1374 text => "delete",
1321 tooltip => "Deletes the binding", 1375 tooltip => "Deletes the binding",
1322 on_activate => sub { 1376 on_activate => sub {
1323 $binding_list->remove ($hb); 1377 $binding_list->remove ($hb);
1324 delete $::CFG->{bindings}->{$mod}->{$sym}; 1378 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1325 0 1379 0
1326 }); 1380 });
1327 1381
1328 $hb->add (new CFClient::UI::Button 1382 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1383 text => "edit",
1330 tooltip => "Edits the binding", 1384 tooltip => "Edits the binding",
1331 on_activate => sub { 1385 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1386 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1387 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1388 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1389 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1390 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1391 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1392 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1341 }, 1395 },
1342 sub { 1396 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1430 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1431 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1432 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1433 sub {
1380 my ($mod, $sym, $cmds) = @_; 1434 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1435 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1436 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1437 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1438 $SETUP_DIALOG->show;
1385 }, 1439 },
1386 sub { 1440 sub {
… …
1415 y => 'center', 1469 y => 'center',
1416 z => 2, 1470 z => 2,
1417 name => 'doc_browser', 1471 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1472 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1473 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1474 title => "Help Browser",
1475 has_close_button => 1;
1421 1476
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1477 $win->add (my $vbox = new CFClient::UI::VBox);
1423 1478
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1479 $vbox->add (my $buttons = new CFClient::UI::HBox);
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1480 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1483 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1484 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1485 value => undef,
1431 options => [ 1486 options => [
1432 [intro => "Introduction"], 1487 [intro => "Introduction"],
1433 [manual => "Manual"], 1488 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1489 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1490 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1491 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1492 [COPYING => "License Terms"],
1438 ], 1493 ],
1439 on_changed => sub { 1494 on_changed => sub {
1440 my ($self, $pod) = @_; 1495 my ($self, $pod) = @_;
1441 1496
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1497 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1498 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1444 1499
1445 $viewer->clear; 1500 $viewer->clear;
1501
1502# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1503# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1504# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1505# ]);#d#
1446 1506
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1507 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1448 for @$pom; 1508 for @$pom;
1449 1509
1450 $viewer->set_offset (0); 1510 $viewer->set_offset (0);
1511
1451 0 1512 0
1452 }, 1513 },
1453 on_visibility_change => sub { 1514 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1515 my ($self, $visible) = @_;
1455 return unless $visible; 1516 return unless $visible;
… …
1502 z => 100, 1563 z => 100,
1503 force_x => "max", 1564 force_x => "max",
1504 force_y => 0; 1565 force_y => 0;
1505 $DEBUG_STATUS->show; 1566 $DEBUG_STATUS->show;
1506 1567
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1568 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1569
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1570 $STATUSBOX = new CFClient::UI::Statusbox;
1510 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1571 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1572
1512 (new CFClient::UI::Frame 1573 (new CFClient::UI::Frame
… …
1563 force_w => $::WIDTH * 0.6, 1624 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1625 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1626 has_close_button => 1,
1566 ; 1627 ;
1567 1628
1629 $METASERVER = metaserver_dialog;
1630
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1631 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1632 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1633
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1634 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1572 "Configure the server to play on, your username, password and other server-related options."); 1635 "Configure the server to play on, your username, password and other server-related options.");
… …
1575 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1638 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1576 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1639 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1577 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1640 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1578 "Configure the use of audio, sound effects and background music."); 1641 "Configure the use of audio, sound effects and background music.");
1579 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1642 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1580 "Lets you define, edit and delete bindings." 1643 "Lets you define, edit and delete key bindings."
1581 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1644 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1582 . "with nothing set and the recording started. After doing the actions you " 1645 . "with nothing set and the recording started. After doing the actions you "
1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1646 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1584 . "After pressing the combo the binding will be saved automatically and the " 1647 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1648 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1649 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggign options. Do not ask."); 1650 "Some debuggin' options. Do not ask.");
1590 1651
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1652 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1653
1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1654 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1594 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1655 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1658 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1659
1599 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 1660 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
1600 1661
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1662 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1663 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 1664
1607 $BUTTONBAR->add (new CFClient::UI::Button 1665 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1666 text => "Save Config",
1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1667 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1610 on_activate => sub { 1668 on_activate => sub {
… …
1613 status "Configuration Saved"; 1671 status "Configuration Saved";
1614 0 1672 0
1615 }, 1673 },
1616 ); 1674 );
1617 1675
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 1677 tooltip => "View Documentation");
1620 1678
1621 $BUTTONBAR->add (new CFClient::UI::Button 1679 $BUTTONBAR->add (new CFClient::UI::Button
1622 text => "Quit", 1680 text => "Quit",
1623 tooltip => "Terminates the program", 1681 tooltip => "Terminates the program",
… …
1864 1922
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1923 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1866 CFClient::UI::set_layout ($::CFG->{layout}); 1924 CFClient::UI::set_layout ($::CFG->{layout});
1867 1925
1868 my %DEF_CFG = ( 1926 my %DEF_CFG = (
1869 sdl_mode => 0, 1927 sdl_mode => 0,
1870 width => 640, 1928 width => 640,
1871 height => 480, 1929 height => 480,
1872 fullscreen => 0, 1930 fullscreen => 0,
1873 fast => 0, 1931 fast => 0,
1874 map_scale => 1, 1932 map_scale => 1,
1875 fow_enable => 1, 1933 fow_enable => 1,
1876 fow_intensity => 0.45, 1934 fow_intensity => 0.45,
1877 fow_smooth => 0, 1935 fow_smooth => 0,
1878 gui_fontsize => 1, 1936 gui_fontsize => 1,
1879 log_fontsize => 0.7, 1937 log_fontsize => 0.7,
1880 gauge_fontsize=> 1, 1938 gauge_fontsize => 1,
1881 gauge_size => 0.35, 1939 gauge_size => 0.35,
1882 stat_fontsize => 0.7, 1940 stat_fontsize => 0.7,
1883 mapsize => 100, 1941 mapsize => 100,
1884 host => "crossfire.schmorp.de",
1885 say_command => 'say', 1942 say_command => 'say',
1886 audio_enable => 1, 1943 audio_enable => 1,
1887 bgm_enable => 1, 1944 bgm_enable => 1,
1888 bgm_volume => 0.25, 1945 bgm_volume => 0.25,
1889 face_prefetch => 0, 1946 face_prefetch => 0,
1890 output_sync => 1, 1947 output_sync => 1,
1891 output_count => 1, 1948 output_count => 1,
1892 pickup => 0, 1949 pickup => 0,
1950 default => "profile", # default profile
1951 );
1893 ); 1952
1894
1895 while (my ($k, $v) = each %DEF_CFG) { 1953 while (my ($k, $v) = each %DEF_CFG) {
1896 $CFG->{$k} = $v unless exists $CFG->{$k}; 1954 $CFG->{$k} = $v unless exists $CFG->{$k};
1897 } 1955 }
1956
1957 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1898 1958
1899 sdl_init; 1959 sdl_init;
1900 1960
1901 @SDL_MODES = reverse 1961 @SDL_MODES = reverse
1902 grep $_->[0] >= 640 && $_->[1] >= 480, 1962 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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