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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs. Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC