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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs. Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.57 by root, Mon Jun 5 21:10:04 2006 UTC