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.57 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::MapWidget; 41use CFClient::MapWidget;
42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 44
43$Event::DIED = sub { 45$Event::DIED = sub {
44 # TODO: display dialog box or so 46 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
… …
89our $SETUP_NOTEBOOK; 91our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 92our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 93our $SETUP_KEYBOARD;
92our $SETUP_SPELLS; 94our $SETUP_SPELLS;
93 95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
94our $FLOORBOX; 98our $FLOORBOX;
95our $GAUGES; 99our $GAUGES;
96our $STATWIDS; 100our $STATWIDS;
97 101
98our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120} 124}
121 125
122sub debug { 126sub debug {
123 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
128}
129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
124} 309}
125 310
126sub start_game { 311sub start_game {
127 status "logging in..."; 312 status "logging in...";
128 313
… …
147 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 333 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
150 map => $MAP, 335 map => $MAP,
151 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
152 338
153 sound_play => sub { 339 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
155 341
156 $SDL_MIXER 342 $SDL_MIXER
… …
181 367
182 return unless $CONN; 368 return unless $CONN;
183 369
184 status "connection closed"; 370 status "connection closed";
185 371
372 destroy_query_dialog $CONN;
186 $CONN->destroy; 373 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
188} 375}
189 376
190sub graphics_setup { 377sub graphics_setup {
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 x => "max", 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
… …
849 title => "Messages", 1036 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
852 x => "max", 1039 x => "max",
853 y => 0, 1040 y => 0,
854 force_w => $::WIDTH / 3, 1041 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
857 1044
858 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
859 1046
860 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
… …
935sub autopickup_setup { 1122sub autopickup_setup {
936 my $table = new CFClient::UI::Table; 1123 my $table = new CFClient::UI::Table;
937 1124
938 for ( 1125 for (
939 ["General", 0, 0, 1126 ["General", 0, 0,
940 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1127 ["Enable autopickup" => PICKUP_NEWMODE],
941 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
942 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1129 ["Stop before pickup" => PICKUP_STOP],
943 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1130 ["Debug autopickup" => PICKUP_DEBUG],
944 ], 1131 ],
945 ["Weapons", 0, 6, 1132 ["Weapons", 0, 6,
946 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1133 ["All weapons" => PICKUP_ALLWEAPON],
947 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
948 ["Bows" => CFClient::Pickup::PU_BOW], 1135 ["Bows" => PICKUP_BOW],
949 ["Arrows" => CFClient::Pickup::PU_ARROW], 1136 ["Arrows" => PICKUP_ARROW],
950 ], 1137 ],
951 ["Armour", 0, 12, 1138 ["Armour", 0, 12,
952 ["Helmets" => CFClient::Pickup::PU_HELMET], 1139 ["Helmets" => PICKUP_HELMET],
953 ["Shields" => CFClient::Pickup::PU_SHIELD], 1140 ["Shields" => PICKUP_SHIELD],
954 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1141 ["Body Armour" => PICKUP_ARMOUR],
955 ["Boots" => CFClient::Pickup::PU_BOOTS], 1142 ["Boots" => PICKUP_BOOTS],
956 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1143 ["Gloves" => PICKUP_GLOVES],
957 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1144 ["Cloaks" => PICKUP_CLOAK],
958 ], 1145 ],
959 1146
960 ["Readables", 2, 2, 1147 ["Readables", 2, 2,
961 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1148 ["Spellbooks" => PICKUP_SPELLBOOK],
962 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
963 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
964 ], 1151 ],
965 ["Misc", 2, 7, 1152 ["Misc", 2, 7,
966 ["Food" => CFClient::Pickup::PU_FOOD], 1153 ["Food" => PICKUP_FOOD],
967 ["Drinks" => CFClient::Pickup::PU_DRINK], 1154 ["Drinks" => PICKUP_DRINK],
968 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
969 ["Keys" => CFClient::Pickup::PU_KEY], 1156 ["Keys" => PICKUP_KEY],
970 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1157 ["Magical Items" => PICKUP_MAGICAL],
971 ["Potions" => CFClient::Pickup::PU_POTION], 1158 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1161 ["Jewelery" => PICKUP_JEWELS],
975 ], 1162 ],
976 ) 1163 )
977 { 1164 {
978 my ($title, $x, $y, @bits) = @$_; 1165 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
… …
999 } 1186 }
1000 1187
1001 $table 1188 $table
1002} 1189}
1003 1190
1004sub make_inventory_window { 1191sub inventory_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1193 x => "center",
1007 y => "center", 1194 y => "center",
1008 force_w => $WIDTH * 9/10, 1195 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1196 force_h => $HEIGHT * 9/10,
… …
1268 force_w => $::WIDTH * 0.6, 1455 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6, 1456 force_h => $::HEIGHT * 0.6,
1270 ; 1457 ;
1271 1458
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274 1461
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1463 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1464 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1465 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1467 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1468 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music."); 1469 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294 1481
1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1483 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297 1484
1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300 1487
1301 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 1488 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
1302 1489
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308 1495
1309 $BUTTONBAR->add (new CFClient::UI::Button 1496 $BUTTONBAR->add (new CFClient::UI::Button
1310 text => "Save Config", 1497 text => "Save Config",
… …
1572 map_scale => 1, 1759 map_scale => 1,
1573 fow_enable => 1, 1760 fow_enable => 1,
1574 fow_intensity => 0.45, 1761 fow_intensity => 0.45,
1575 fow_smooth => 0, 1762 fow_smooth => 0,
1576 gui_fontsize => 1, 1763 gui_fontsize => 1,
1577 log_fontsize => 1, 1764 log_fontsize => 0.7,
1578 gauge_fontsize=> 1, 1765 gauge_fontsize=> 1,
1579 gauge_size => 0.35, 1766 gauge_size => 0.35,
1580 stat_fontsize => 1, 1767 stat_fontsize => 0.7,
1581 mapsize => 100, 1768 mapsize => 100,
1582 host => "crossfire.schmorp.de", 1769 host => "crossfire.schmorp.de",
1583 say_command => 'say', 1770 say_command => 'say',
1584 audio_enable => 1, 1771 audio_enable => 1,
1585 bgm_enable => 1, 1772 bgm_enable => 1,

Diff Legend

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