[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.66 by elmex, Thu Jun 8 19:43:26 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
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
38	use CFClient;	37	use CFClient;
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
46	Carp::confess $_[1];#d#TODO: remove when stable	47	Carp::confess $_[1];#d#TODO: remove when stable
47	CFClient::error $_[1];	48	CFClient::error $_[1];
…		…
90	our $SETUP_NOTEBOOK;	91	our $SETUP_NOTEBOOK;
91	our $SETUP_SERVER;	92	our $SETUP_SERVER;
92	our $SETUP_KEYBOARD;	93	our $SETUP_KEYBOARD;
93	our $SETUP_SPELLS;	94	our $SETUP_SPELLS;
94		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
95	our $FLOORBOX;	98	our $FLOORBOX;
96	our $GAUGES;	99	our $GAUGES;
97	our $STATWIDS;	100	our $STATWIDS;
98		101
99	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
120	$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]);
121	}	124	}
122		125
123	sub debug {	126	sub debug {
124	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
		128	}
		129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub 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	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[7 => "Cha", "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;
125	}	309	}
126		310
127	sub start_game {	311	sub start_game {
128	status "logging in...";	312	status "logging in...";
129		313
…		…
148	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
149	logview => $LOGVIEW,	333	logview => $LOGVIEW,
150	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
151	map => $MAP,	335	map => $MAP,
152	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
153		338
154	sound_play => sub {	339	sound_play => sub {
155	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
156		341
157	$SDL_MIXER	342	$SDL_MIXER
…		…
174	}	359	}
175	}	360	}
176		361
177	sub stop_game {	362	sub stop_game {
178	$LOGIN_BUTTON->set_text ("Login");	363	$LOGIN_BUTTON->set_text ("Login");
		364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	365	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	366	$INV_WINDOW->hide;
181	$LOGVIEW->hide;
182		367
183	return unless $CONN;	368	return unless $CONN;
184		369
185	status "connection closed";	370	status "connection closed";
186		371
		372	destroy_query_dialog $CONN;
187	$CONN->destroy;	373	$CONN->destroy;
188	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
189	}	375	}
190		376
191	sub graphics_setup {	377	sub graphics_setup {
…		…
439	&set_gauge_window_fontsize;	625	&set_gauge_window_fontsize;
440		626
441	$win	627	$win
442	}	628	}
443		629
		630	sub debug_setup {
		631	my $table = new CFClient::UI::Table;
444		632
		633	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		634	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
		635	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		636	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
		637	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		638	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
		639	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		640	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
		641
		642	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		643
		644	for my $x (0..2) {
		645	for my $y (0 .. 2) {
		646	$table->add ($x + 3, $y,
		647	new CFClient::UI::Entry
		648	text => $default_smooth[$x * 3 + $y],
		649	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		650	);
		651	}
		652	}
		653
		654
		655	$table
		656	}
		657
445	sub make_stats_window {	658	sub stats_window {
446	my $tgw = new CFClient::UI::FancyFrame	659	my $tgw = new CFClient::UI::FancyFrame
447	y => $HEIGHT * (2/8),	660	y => $HEIGHT * (2/8),
448	x => "max",	661	x => "max",
449	title => "Stats",	662	title => "Stats",
450	name => "stats_window";	663	name => "stats_window";
…		…
660		873
661	utf8::decode $buf if utf8::valid $buf;	874	utf8::decode $buf if utf8::valid $buf;
662		875
663	$table->clear;	876	$table->clear;
664		877
		878	my @tip = (
		879	"The current number of users logged in on the server.",
		880	"The hostname of the server.",
		881	"The time this server has been running without being restarted.",
		882	"The server software version - a '+' indicates a Crossfire+ server.",
		883	"Short information about this server provided by its admins.",
		884	);
665	my @col = qw(Use #Users Host Uptime Version Description);	885	my @col = qw(#Users Host Uptime Version Description);
666	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	886	$table->add ($_, 0, new CFClient::UI::Label
		887	can_hover => 1, can_events => 1,
		888	align => 0, fg => [1, 1, 0],
		889	text => $col[$_], tooltip => $tip[$_])
667	for 0 .. $#col;	890	for 0 .. $#col;
668		891
669	my @align = qw(1 0 1 1 -1);	892	my @align = qw(1 0 1 1 -1);
670		893
671	my $y = 0;	894	my $y = 0;
672	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	895	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
689		912
690	$m = [$users, $host, $uptime, $version, $desc];	913	$m = [$users, $host, $uptime, $version, $desc];
691		914
692	$y++;	915	$y++;
693		916
694	$table->add (0, $y, new CFClient::UI::VBox children => [	917	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695	(new CFClient::UI::Button text => "Use", on_activate => sub {	918	(new CFClient::UI::Button
		919	text => "Use",
		920	tooltip => "Put this server into the <b>Host:Port</b> field",
		921	on_activate => sub {
696	$HOST_ENTRY->set_text ($CFG->{host} = $host);	922	$HOST_ENTRY->set_text ($CFG->{host} = $host);
697	$METASERVER->toggle_visibility;	923	$METASERVER->hide;
		924	},
698	}),	925	),
699	(new CFClient::UI::Empty expand => 1),	926	(new CFClient::UI::Empty expand => 1),
700	]);	927	]);
701		928
702	$table->add ($_ + 1, $y, new CFClient::UI::Label	929	$table->add ($_, $y, new CFClient::UI::Label
703	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	930	ellipsise => 0,
		931	align => $align[$_],
		932	text => $m->[$_],
		933	tooltip => $tip[$_],
		934	can_hover => 1,
		935	can_events => 1,
		936	fontsize => 0.8)
704	for 0 .. $#$m;	937	for 0 .. $#$m;
705	}	938	}
706	}	939	}
707	});	940	});
708	}	941	}
709		942
710	sub metaserver_dialog {	943	sub metaserver_dialog {
711	my $dialog = new CFClient::UI::FancyFrame	944	my $dialog = new CFClient::UI::FancyFrame
712	title => "Server List",	945	title => "Server List",
713	name => 'metaserver_dialog',	946	name => 'metaserver_dialog',
714	x => 'center',	947	x => 'center',
715	y => 'center',	948	y => 'center',
		949	z => 3,
		950	force_h => $::HEIGHT * 0.4,
716	child => (my $vbox = new CFClient::UI::VBox),	951	child => (my $vbox = new CFClient::UI::VBox),
717	on_visibility_change => sub {	952	on_visibility_change => sub {
718	update_metaserver if $_[1];	953	update_metaserver if $_[1];
719	},	954	},
720	;	955	;
721		956
722	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	957	$dialog->{table} = new CFClient::UI::Table;
		958
		959	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723		960
724	$dialog	961	$dialog
725	}	962	}
726		963
727	sub server_setup {	964	sub server_setup {
…		…
750	expand => 1,	987	expand => 1,
751	text => "Server List",	988	text => "Server List",
752	other => $METASERVER,	989	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	990	tooltip => "Show a list of available crossfire servers",
754	on_activate => sub { $METASERVER->toggle_visibility },	991	on_activate => sub { $METASERVER->toggle_visibility },
		992	on_visibility_change => sub { $METASERVER->hide unless $_[1] },
755	);	993	);
756	}	994	}
757		995
758	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	996	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759	$table->add (1, 4, new CFClient::UI::Entry	997	$table->add (1, 4, new CFClient::UI::Entry
…		…
849	title => "Messages",	1087	title => "Messages",
850	border_bg => [1, 1, 1, 1],	1088	border_bg => [1, 1, 1, 1],
851	bg => [0, 0, 0, 0.75],	1089	bg => [0, 0, 0, 0.75],
852	x => "max",	1090	x => "max",
853	y => 0,	1091	y => 0,
854	force_w => $::WIDTH / 3,	1092	force_w => $::WIDTH * 0.4,
855	force_h => $::HEIGHT / 5,	1093	force_h => $::HEIGHT * 0.5,
856	child => (my $vbox = new CFClient::UI::VBox);	1094	child => (my $vbox = new CFClient::UI::VBox);
857		1095
858	$vbox->add ($LOGVIEW);	1096	$vbox->add ($LOGVIEW);
859		1097
860	$vbox->add (my $input = new CFClient::UI::Entry	1098	$vbox->add (my $input = new CFClient::UI::Entry
…		…
903	sub open_quit_dialog {	1141	sub open_quit_dialog {
904	unless ($QUIT_DIALOG) {	1142	unless ($QUIT_DIALOG) {
905	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1143	$QUIT_DIALOG = new CFClient::UI::FancyFrame
906	x => "center",	1144	x => "center",
907	y => "center",	1145	y => "center",
		1146	z => 50,
908	title => "Really Quit?",	1147	title => "Really Quit?",
909	;	1148	;
910		1149
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1150	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912		1151
…		…
930		1169
931	$QUIT_DIALOG->show;	1170	$QUIT_DIALOG->show;
932	}	1171	}
933		1172
934	sub autopickup_setup {	1173	sub autopickup_setup {
935	my $vb = new CFClient::UI::VBox;	1174	my $table = new CFClient::UI::Table;
936
937	$vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939	$hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940	$hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942	my $tbl = 0;
943	my $tblrow = 0;
944		1175
945	for (	1176	for (
946	["General", $gen_tbl],	1177	["General", 0, 0,
947	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1178	["Enable autopickup" => PICKUP_NEWMODE],
948	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1179	["Inhibit autopickup" => PICKUP_INHIBIT],
949	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1180	["Stop before pickup" => PICKUP_STOP],
950	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1181	["Debug autopickup" => PICKUP_DEBUG],
		1182	],
951	["Weapons", $ltbl],	1183	["Weapons", 0, 6,
952	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1184	["All weapons" => PICKUP_ALLWEAPON],
953	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1185	["Missile weapons" => PICKUP_MISSILEWEAPON],
954	["Bows" => CFClient::Pickup::PU_BOW],	1186	["Bows" => PICKUP_BOW],
955	["Arrows" => CFClient::Pickup::PU_ARROW],	1187	["Arrows" => PICKUP_ARROW],
		1188	],
956	["Armour"],	1189	["Armour", 0, 12,
957	["Helmets" => CFClient::Pickup::PU_HELMET],	1190	["Helmets" => PICKUP_HELMET],
958	["Shields" => CFClient::Pickup::PU_SHIELD],	1191	["Shields" => PICKUP_SHIELD],
959	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1192	["Body Armour" => PICKUP_ARMOUR],
960	["Boots" => CFClient::Pickup::PU_BOOTS],	1193	["Boots" => PICKUP_BOOTS],
961	["Gloves" => CFClient::Pickup::PU_GLOVES],	1194	["Gloves" => PICKUP_GLOVES],
962	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1195	["Cloaks" => PICKUP_CLOAK],
		1196	],
		1197
963	["Readables", $rtbl],	1198	["Readables", 2, 2,
964	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1199	["Spellbooks" => PICKUP_SPELLBOOK],
965	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1200	["Skillscrolls" => PICKUP_SKILLSCROLL],
966	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1201	["Normal Books/Scrolls" => PICKUP_READABLES],
		1202	],
967	["Misc"],	1203	["Misc", 2, 7,
968	["Food" => CFClient::Pickup::PU_FOOD],	1204	["Food" => PICKUP_FOOD],
969	["Drinks" => CFClient::Pickup::PU_DRINK],	1205	["Drinks" => PICKUP_DRINK],
970	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1206	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971	["Keys" => CFClient::Pickup::PU_KEY],	1207	["Keys" => PICKUP_KEY],
972	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1208	["Magical Items" => PICKUP_MAGICAL],
973	["Potions" => CFClient::Pickup::PU_POTION],	1209	["Potions" => PICKUP_POTION],
974	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1210	["Magic Devices" => PICKUP_MAGIC_DEVICE],
975	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1211	["Ignore cursed" => PICKUP_NOT_CURSED],
976	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1212	["Jewelery" => PICKUP_JEWELS],
		1213	],
		1214	["Weight/Value ratio", 2, 17]
977	)	1215	)
978	{	1216	{
979	if (ref $_->[1]) {	1217	my ($title, $x, $y, @bits) = @$_;
980	$tbl = $_->[1];
981	$tblrow = 0;
982	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1218	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983	} elsif (not defined $_->[1]) {	1219
984	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1220	for (@bits) {
985	} else {	1221	++$y;
		1222
986	my $mask = $_->[1];	1223	my $mask = $_->[1];
987	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1224	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox	1225	$table->add ($x+1, $y, new CFClient::UI::CheckBox
989	state => $CFG->{pickup} & $mask,	1226	state => $CFG->{pickup} & $mask,
990	on_changed => sub {	1227	on_changed => sub {
991	my ($box, $value) = @_;	1228	my ($box, $value) = @_;
		1229
992	if ($value) {	1230	if ($value) {
993	$::CFG->{pickup} \|= $mask;	1231	$::CFG->{pickup} \|= $mask;
994	} else {	1232	} else {
995	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1233	$::CFG->{pickup} &= ~$mask;
996	}	1234	}
		1235
997	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1236	$::CONN->send_command ("pickup $::CFG->{pickup}")
998	if defined $::CONN;	1237	if defined $::CONN;
999	});	1238	});
1000	}	1239	}
1001	}	1240	}
1002		1241
1003	$vb	1242	$table->add (2, 18, new CFClient::UI::ValSlider
1004	}	1243	range => [0, 0, 16, 1, 1],
		1244	to_value => sub { ">= " . 5 * $_[0] },
		1245	on_changed => sub {
		1246	my ($slider, $value) = @_;
1005		1247
		1248	$::CFG->{pickup} &= ~0x7;
		1249	$::CFG->{pickup} \|= int $value
		1250	if $value;
		1251	1;
		1252	});
		1253	$table->add (3, 18, new CFClient::UI::Button
		1254	text => "set",
		1255	on_activate => sub {
		1256	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1257	if defined $::CONN;
		1258	1;
		1259	});
		1260
		1261	$table
		1262	}
		1263
1006	sub make_inventory_window {	1264	sub inventory_window {
1007	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1265	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008	x => "center",	1266	x => "center",
1009	y => "center",	1267	y => "center",
1010	force_w => $WIDTH * 9/10,	1268	force_w => $WIDTH * 9/10,
1011	force_h => $HEIGHT * 9/10,	1269	force_h => $HEIGHT * 9/10,
…		…
1103	$SETUP_DIALOG->show;	1361	$SETUP_DIALOG->show;
1104	},	1362	},
1105	sub {	1363	sub {
1106	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1364	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107	$SETUP_DIALOG->show;	1365	$SETUP_DIALOG->show;
1108	});	1366	},
		1367	);
1109	$SETUP_DIALOG->hide;	1368	$SETUP_DIALOG->hide;
1110	$::BIND_EDITOR->show;	1369	$::BIND_EDITOR->show;
1111	},	1370	},
1112	);	1371	);
1113		1372
…		…
1123	$refresh->();	1382	$refresh->();
1124		1383
1125	$vb	1384	$vb
1126	}	1385	}
1127		1386
1128	sub make_help_window {	1387	sub help_window {
1129	my $win = new CFClient::UI::FancyFrame	1388	my $win = new CFClient::UI::FancyFrame
1130	x => 'center',	1389	x => 'center',
1131	y => 'center',	1390	y => 'center',
		1391	z => 2,
1132	name => 'doc_browser',	1392	name => 'doc_browser',
1133	force_w => int $WIDTH * 7/8,	1393	force_w => int $WIDTH * 7/8,
1134	force_h => int $HEIGHT * 7/8,	1394	force_h => int $HEIGHT * 7/8,
1135	title => "Documentation";	1395	title => "Documentation";
1136		1396
1137	$win->add (my $vbox = new CFClient::UI::VBox);	1397	$win->add (my $vbox = new CFClient::UI::VBox);
1138		1398
1139	$vbox->add (my $buttons = new CFClient::UI::HBox);	1399	$vbox->add (my $buttons = new CFClient::UI::HBox);
1140	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1400	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1401	expand => 1, fontsize => 0.8, padding_x => 4);
1141		1402
1142	for (	1403	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1404	$buttons->add (my $combo = new CFClient::UI::Combobox
		1405	value => undef,
		1406	options => [
1143	[intro => "Introduction"],	1407	[intro => "Introduction"],
1144	[manual => "Manual"],	1408	[manual => "Manual"],
		1409	[skill_help => "Skills"],
1145	[command_help => "Commands"],	1410	[command_help => "Commands"],
1146	[skill_help => "Skills"],	1411	[dmcommand_help => "DM Commands"],
1147	) {	1412	[COPYING => "License Terms"],
1148	my ($pod, $label) = @$_;	1413	],
		1414	on_changed => sub {
		1415	my ($self, $pod) = @_;
1149		1416
1150	$buttons->add (new CFClient::UI::Button	1417	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151	text => $label,	1418	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152	on_activate => sub {
1153	my $parser = new Pod::POM;
1154	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1155		1419
1156	$viewer->clear;	1420	$viewer->clear;
1157		1421
1158	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1422	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159	for @{ CFClient::pod_to_pango_list $pom };	1423	for @$pom;
1160		1424
1161	$viewer->set_offset (0);	1425	$viewer->set_offset (0);
1162	},	1426	},
		1427	on_visibility_change => sub {
		1428	my ($self, $visible) = @_;
		1429	return unless $visible;
		1430	return if $self->{value};
		1431	$self->set_value ("intro");
		1432	},
1163	);	1433	);
1164	}
1165
1166	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167		1434
1168	$win	1435	$win
1169	}	1436	}
1170		1437
1171	sub sdl_init {	1438	sub sdl_init {
…		…
1211	$DEBUG_STATUS->show;	1478	$DEBUG_STATUS->show;
1212		1479
1213	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1480	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214		1481
1215	$STATUSBOX = new CFClient::UI::Statusbox;	1482	$STATUSBOX = new CFClient::UI::Statusbox;
1216	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1483	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217		1484
1218	(new CFClient::UI::Frame	1485	(new CFClient::UI::Frame
1219	bg => [0, 0, 0, 0.4],	1486	bg => [0, 0, 0, 0.4],
1220	force_x => 0,	1487	force_x => 0,
1221	force_y => "max",	1488	force_y => "max",
…		…
1248	}	1515	}
1249	});	1516	});
1250	$MAPWIDGET->show;	1517	$MAPWIDGET->show;
1251	$MAPWIDGET->focus_in;	1518	$MAPWIDGET->focus_in;
1252		1519
1253	$LOGVIEW = new CFClient::UI::TextView	1520	$LOGVIEW = new CFClient::UI::TextScroller
1254	expand => 1,	1521	expand => 1,
1255	font => $FONT_FIXED,	1522	font => $FONT_FIXED,
1256	fontsize => $::CFG->{log_fontsize},	1523	fontsize => $::CFG->{log_fontsize},
		1524	indent => -4,
1257	can_hover => 1,	1525	can_hover => 1,
1258	can_events => 1,	1526	can_events => 1,
1259	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1527	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260	;	1528	;
1261		1529
1262	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1530	$SETUP_DIALOG = new CFClient::UI::FancyFrame
1263	title => "Setup",	1531	title => "Setup",
1264	name => "setup_dialog",	1532	name => "setup_dialog",
1265	x => 'center',	1533	x => 'center',
1266	y => 'center',	1534	y => 'center',
		1535	z => 2,
1267	force_w => $::WIDTH * 0.6,	1536	force_w => $::WIDTH * 0.6,
1268	force_h => $::HEIGHT * 0.6,	1537	force_h => $::HEIGHT * 0.6,
1269	;	1538	;
1270		1539
1271	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook);	1540	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1541	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272		1542
1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1543	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274	"Configure the server to play on, your username, password and other server-related options.");	1544	"Configure the server to play on, your username, password and other server-related options.");
1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1545	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1546	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1547	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1548	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1549	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1280	"Configure the use of audio, sound effects and background music.");	1550	"Configure the use of audio, sound effects and background music.");
1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1551	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282	"Lets you define, edit and delete bindings."	1552	"Lets you define, edit and delete bindings."
1283	. "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "	1553	. "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 "	1554	. "with nothing set and the recording started. After doing the actions you "
1285	. "want to record press Insert and you will be asked to press a key-combo."	1555	. "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 "	1556	. "After pressing the combo the binding will be saved automatically and the "
1287	. "binding editor closes");	1557	. "binding editor closes");
1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1558	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1559	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1560	$SETUP_NOTEBOOK->add (Debug => debug_setup,
		1561	"Some debuggign options. Do not ask.");
1290		1562
1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1563	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292		1564
1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1565	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1566	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295		1567
1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1568	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1569	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298		1570
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	1571	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
1300		1572
1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1573	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1574	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1575	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."	1576	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305	."You can also hit the Tab-key to show/hide the Inventory.");	1577	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306		1578
1307	$BUTTONBAR->add (new CFClient::UI::Button	1579	$BUTTONBAR->add (new CFClient::UI::Button
1308	text => "Save Config",	1580	text => "Save Config",
1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1581	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310	on_activate => sub {	1582	on_activate => sub {
…		…
1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1584	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313	status "Configuration Saved";	1585	status "Configuration Saved";
1314	},	1586	},
1315	);	1587	);
1316		1588
1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1589	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318	tooltip => "View Documentation");	1590	tooltip => "View Documentation");
1319		1591
1320	$BUTTONBAR->add (new CFClient::UI::Button	1592	$BUTTONBAR->add (new CFClient::UI::Button
1321	text => "Quit",	1593	text => "Quit",
1322	tooltip => "Terminates the program",	1594	tooltip => "Terminates the program",
…		…
1570	map_scale => 1,	1842	map_scale => 1,
1571	fow_enable => 1,	1843	fow_enable => 1,
1572	fow_intensity => 0.45,	1844	fow_intensity => 0.45,
1573	fow_smooth => 0,	1845	fow_smooth => 0,
1574	gui_fontsize => 1,	1846	gui_fontsize => 1,
1575	log_fontsize => 1,	1847	log_fontsize => 0.7,
1576	gauge_fontsize=> 1,	1848	gauge_fontsize=> 1,
1577	gauge_size => 0.35,	1849	gauge_size => 0.35,
1578	stat_fontsize => 1,	1850	stat_fontsize => 0.7,
1579	mapsize => 100,	1851	mapsize => 100,
1580	host => "crossfire.schmorp.de",	1852	host => "crossfire.schmorp.de",
1581	say_command => 'say',	1853	say_command => 'say',
1582	audio_enable => 1,	1854	audio_enable => 1,
1583	bgm_enable => 1,	1855	bgm_enable => 1,
1584	bgm_volume => 0.25,	1856	bgm_volume => 0.25,
1585	face_prefetch => 0,	1857	face_prefetch => 0,
1586	output_sync => 1,	1858	output_sync => 1,
1587	output_count => 1,	1859	output_count => 1,
		1860	pickup => 0,
1588	);	1861	);
1589		1862
1590	while (my ($k, $v) = each %DEF_CFG) {	1863	while (my ($k, $v) = each %DEF_CFG) {
1591	$CFG->{$k} = $v unless exists $CFG->{$k};	1864	$CFG->{$k} = $v unless exists $CFG->{$k};
1592	}	1865	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs. Revision 1.66 by elmex, Thu Jun 8 19:43:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.66 by elmex, Thu Jun 8 19:43:26 2006 UTC