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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.29 by root, Mon May 29 21:54:16 2006 UTC vs.
Revision 1.56 by root, Mon Jun 5 05:23:21 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
…		…
103	our $INV_WINDOW;	109	our $INV_WINDOW;
104	our $INV;	110	our $INV;
105	our $INVR;	111	our $INVR;
106	our $INV_RIGHT_HB;	112	our $INV_RIGHT_HB;
107		113
108	our $BIND_WINDOW;	114	our $BIND_EDITOR;
		115
		116	our $PICKUP_CFG;
109		117
110	sub status {	118	sub status {
111	$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]);
112	}	120	}
113		121
114	sub debug {	122	sub debug {
115	$DEBUG_STATUS->set_text ($_[0]);	123	$DEBUG_STATUS->set_text ($_[0]);
116	my ($w, $h) = $DEBUG_STATUS->size_request;
117	$DEBUG_STATUS->move ($WIDTH - $w, 0);
118	}	124	}
119		125
120	sub start_game {	126	sub start_game {
121	status "logging in...";	127	status "logging in...";
122		128
123	$LOGIN_BUTTON->set_text ("Logout");	129	$LOGIN_BUTTON->set_text ("Logout");
124	$SERVER_SETUP->hide;	130	$SETUP_DIALOG->hide;
125		131
126	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;
127		133
128	my ($host, $port) = split /:/, $CFG->{host};	134	my ($host, $port) = split /:/, $CFG->{host};
129		135
…		…
167	}	173	}
168	}	174	}
169		175
170	sub stop_game {	176	sub stop_game {
171	$LOGIN_BUTTON->set_text ("Login");	177	$LOGIN_BUTTON->set_text ("Login");
172	$SERVER_SETUP->show;	178	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		179	$SETUP_DIALOG->show;
173	$INV_WINDOW->hide;	180	$INV_WINDOW->hide;
174	$LOGVIEW->hide;
175		181
176	return unless $CONN;	182	return unless $CONN;
177		183
178	status "connection closed";	184	status "connection closed";
179		185
180	$CONN->destroy;	186	$CONN->destroy;
181	$CONN = 0; # false, does not autovivify	187	$CONN = 0; # false, does not autovivify
182	}	188	}
183		189
184	sub client_setup {	190	sub graphics_setup {
185	my $dialog = new CFClient::UI::FancyFrame
186	req_x => 1,
187	req_y => $HEIGHT * (1/8),
188	name => "client_setup",
189	title => "Client Setup",
190	child => (my $vbox = new CFClient::UI::VBox);	191	my $vbox = new CFClient::UI::VBox;
		192
191	$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]);
192		194
193	$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");
194	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
195		197
196	$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]);
197	$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");
198		200
199	$mode_slider->connect (changed => sub {	201	$mode_slider->connect (changed => sub {
200	my ($self, $value) = @_;	202	my ($self, $value) = @_;
201		203
…		…
318	on_activate => sub {	320	on_activate => sub {
319	video_shutdown ();	321	video_shutdown ();
320	video_init ();	322	video_init ();
321	}	323	}
322	);	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;
323		335
324	$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");
325	$table->add (1, $row++, new CFClient::UI::CheckBox	337	$table->add (1, $row++, new CFClient::UI::CheckBox
326	state => $CFG->{audio_enable},	338	state => $CFG->{audio_enable},
327	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.",
…		…
358	audio_shutdown ();	370	audio_shutdown ();
359	audio_init ();	371	audio_init ();
360	}	372	}
361	);	373	);
362		374
363	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	375	$vbox
364	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365	text => $CFG->{say_command},
366	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. "
367	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369	on_changed => sub {
370	my ($self, $value) = @_;
371	$CFG->{say_command} = $value;
372	}
373	);
374
375	$dialog
376	}	376	}
377		377
378	sub set_stats_window_fontsize {	378	sub set_stats_window_fontsize {
379	for (values %{$STATWIDS}) {	379	for (values %{$STATWIDS}) {
380	$_->set_fontsize ($::CFG->{stat_fontsize});	380	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
389		389
390	sub make_gauge_window {	390	sub make_gauge_window {
391	my $gh = int $HEIGHT * $CFG->{gauge_size};	391	my $gh = int $HEIGHT * $CFG->{gauge_size};
392		392
393	my $win = new CFClient::UI::Frame (	393	my $win = new CFClient::UI::Frame (
394	req_x => 0,	394	force_x => 0,
395	req_y => -1,	395	force_y => "max",
396	def_w => $WIDTH,	396	force_w => $WIDTH,
397	def_h => $gh,	397	force_h => $gh,
398	);	398	);
399		399
400	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
401	children => [	401	children => [
402	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
441	}	441	}
442		442
443		443
444	sub make_stats_window {	444	sub make_stats_window {
445	my $tgw = new CFClient::UI::FancyFrame	445	my $tgw = new CFClient::UI::FancyFrame
446	req_y => $HEIGHT * (2/8),	446	y => $HEIGHT * (2/8),
447	req_x => -1,	447	x => "max",
448	title => "Stats",	448	title => "Stats",
449	name => "stats_window";	449	name => "stats_window";
450		450
451	$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);
452	$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,
453	can_hover => 1, can_events => 1,	453	can_hover => 1, can_events => 1,
454	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.");
…		…
553	update_stats_window ({});	553	update_stats_window ({});
554		554
555	$tgw	555	$tgw
556	}	556	}
557		557
558	sub formsep {	558	sub formsep($) {
559	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	559	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
560	}	560	}
561		561
562	sub update_stats_window {	562	sub update_stats_window {
563	my ($stats) = @_;	563	my ($stats) = @_;
564		564
…		…
626		626
627	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	627	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628	for keys %tbl;	628	for keys %tbl;
629	}	629	}
630		630
631	sub metaserver_dialog {
632	my $dialog = new CFClient::UI::FancyFrame
633	title => "Server List",
634	child => (my $vbox = new CFClient::UI::VBox);
635
636	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638	$dialog
639	}
640
641	my $METASERVER_ATIME;	631	my $METASERVER_ATIME;
642		632
643	sub update_metaserver {	633	sub update_metaserver {
644	my ($HOST) = @_;
645
646	return if $METASERVER_ATIME > time;	634	return if $METASERVER_ATIME > time;
647	$METASERVER_ATIME = time + 60;	635	$METASERVER_ATIME = time + 60;
648		636
649	my $table = $METASERVER->{table};	637	my $table = $METASERVER->{table};
650	$table->clear;	638	$table->clear;
…		…
702		690
703	$y++;	691	$y++;
704		692
705	$table->add (0, $y, new CFClient::UI::VBox children => [	693	$table->add (0, $y, new CFClient::UI::VBox children => [
706	(new CFClient::UI::Button text => "Use", on_activate => sub {	694	(new CFClient::UI::Button text => "Use", on_activate => sub {
707	$HOST->set_text ($CFG->{host} = $host);	695	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		696	$METASERVER->toggle_visibility;
708	}),	697	}),
709	(new CFClient::UI::Empty expand => 1),	698	(new CFClient::UI::Empty expand => 1),
710	]);	699	]);
711		700
712	$table->add ($_ + 1, $y, new CFClient::UI::Label	701	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
715	}	704	}
716	}	705	}
717	});	706	});
718	}	707	}
719		708
720	sub server_setup {	709	sub metaserver_dialog {
721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	710	my $dialog = new CFClient::UI::FancyFrame
722	x => $WIDTH * (1/3),	711	title => "Server List",
723	y => $HEIGHT * (1/8),	712	name => 'metaserver_dialog',
724	name => "server_setup",	713	x => 'center',
725	title => "Server Setup",	714	y => 'center',
726	child => (my $vbox = new CFClient::UI::VBox),	715	child => (my $vbox = new CFClient::UI::VBox),
727	on_visibility_change => sub {	716	on_visibility_change => sub {
728	my ($self, $visible) = @_;	717	update_metaserver if $_[1];
729	$self->center if $visible;
730	},	718	},
731	;	719	;
732		720
		721	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		722
		723	$dialog
		724	}
		725
		726	sub server_setup {
		727	my $vbox = new CFClient::UI::VBox;
		728
733	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	729	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
734	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	730	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
735		731
736	{	732	{
737	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	733	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
738		734
739	$vbox->add (	735	$vbox->add (
740	my $HOST = new CFClient::UI::Entry	736	$HOST_ENTRY = new CFClient::UI::Entry
741	expand => 1,	737	expand => 1,
742	text => $CFG->{host},	738	text => $CFG->{host},
743	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	739	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744	on_changed => sub {	740	on_changed => sub {
745	my ($self, $value) = @_;	741	my ($self, $value) = @_;
…		…
747	}	743	}
748	);	744	);
749		745
750	$METASERVER = metaserver_dialog;	746	$METASERVER = metaserver_dialog;
751		747
752	$vbox->add (new CFClient::UI::Flopper	748	$vbox->add (new CFClient::UI::Button
753	expand => 1,	749	expand => 1,
754	text => "Server List",	750	text => "Server List",
755	other => $METASERVER,	751	other => $METASERVER,
756	tooltip => "Show a list of available crossfire servers",	752	tooltip => "Show a list of available crossfire servers",
757	on_open => sub {	753	on_activate => sub { $METASERVER->toggle_visibility },
758	update_metaserver $HOST;
759	}
760	);	754	);
761	}	755	}
762		756
763	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	757	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
764	$table->add (1, 4, new CFClient::UI::Entry	758	$table->add (1, 4, new CFClient::UI::Entry
…		…
781	}	775	}
782	);	776	);
783		777
784	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	778	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
785	$table->add (1, 7, new CFClient::UI::Slider	779	$table->add (1, 7, new CFClient::UI::Slider
786	req_w => 100,	780	force_w => 100,
787	range => [$CFG->{mapsize}, 10, 100, 0, 1],	781	range => [$CFG->{mapsize}, 10, 100, 0, 1],
788	tooltip => "This is the size of the portion of the map update the server sends you. "	782	tooltip => "This is the size of the portion of the map update the server sends you. "
789	. "If you set this to a high value you will be able to see further, "	783	. "If you set this to a high value you will be able to see further, "
790	. "but you also increase bandwidth requirements and latency. "	784	. "but you also increase bandwidth requirements and latency. "
791	. "This option is only used once at log-in.",	785	. "This option is only used once at log-in.",
…		…
831	$CONN ? stop_game	825	$CONN ? stop_game
832	: start_game;	826	: start_game;
833	},	827	},
834	);	828	);
835		829
836	$dialog	830	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		831	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		832	text => $CFG->{say_command},
		833	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. "
		834	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		835	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		836	on_changed => sub {
		837	my ($self, $value) = @_;
		838	$CFG->{say_command} = $value;
		839	}
		840	);
		841
		842	$vbox
837	}	843	}
838		844
839	sub message_window {	845	sub message_window {
840	my $window = new CFClient::UI::FancyFrame	846	my $window = new CFClient::UI::FancyFrame
841	name => "message_window",	847	name => "message_window",
842	title => "Messages",	848	title => "Messages",
843	border_bg => [1, 1, 1, 1],	849	border_bg => [1, 1, 1, 1],
844	bg => [0, 0, 0, 0.75],	850	bg => [0, 0, 0, 0.75],
845	req_x => -1,	851	x => "max",
846	req_y => 0,	852	y => 0,
847	def_w => int $::WIDTH / 3,	853	force_w => $::WIDTH / 3,
848	def_h => int $::HEIGHT / 5,	854	force_h => $::HEIGHT / 5,
849	child => (my $vbox = new CFClient::UI::VBox);	855	child => (my $vbox = new CFClient::UI::VBox);
850		856
851	$vbox->add ($LOGVIEW);	857	$vbox->add ($LOGVIEW);
852		858
853	$vbox->add (my $input = new CFClient::UI::Entry	859	$vbox->add (my $input = new CFClient::UI::Entry
…		…
867	},	873	},
868	on_activate => sub {	874	on_activate => sub {
869	my ($input, $text) = @_;	875	my ($input, $text) = @_;
870	$input->set_text ('');	876	$input->set_text ('');
871		877
872	if ($text =~ /^\/bind\s+(.*)$/) {
873	CFClient::Recorder::open_binding_dialog ([$1]);
874	} elsif ($text =~ /^\/(.*)/) {	878	if ($text =~ /^\/(.*)/) {
875	$::CONN->user_send ($1);	879	$::CONN->user_send ($1);
876	} else {	880	} else {
877	my $say_cmd = $::CFG->{say_command} \|\| 'say';	881	my $say_cmd = $::CFG->{say_command} \|\| 'say';
878	$::CONN->user_send ("$say_cmd $text");	882	$::CONN->user_send ("$say_cmd $text");
879	}	883	}
…		…
887	},	891	},
888	);	892	);
889		893
890	$CONSOLE = {	894	$CONSOLE = {
891	window => $window,	895	window => $window,
892	input => $input	896	input => $input,
893	};	897	};
894		898
895	$window	899	$window
896	}	900	}
897		901
898	sub open_quit_dialog {	902	sub open_quit_dialog {
899	unless ($QUIT_DIALOG) {	903	unless ($QUIT_DIALOG) {
900	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	904	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		905	x => "center",
		906	y => "center",
		907	z => 50,
		908	title => "Really Quit?",
		909	;
901		910
902	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
903		912
904	$vb->add (new CFClient::UI::Label	913	$vb->add (new CFClient::UI::Label
905	text => "You should find a savebed and apply it first!",	914	text => "You should find a savebed and apply it first!",
…		…
918	on_activate => sub { exit },	927	on_activate => sub { exit },
919	);	928	);
920	}	929	}
921		930
922	$QUIT_DIALOG->show;	931	$QUIT_DIALOG->show;
923	$QUIT_DIALOG->center;	932	}
		933
		934	sub autopickup_setup {
		935	my $table = new CFClient::UI::Table;
		936
		937	for (
		938	["General", 0, 0,
		939	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
		940	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		941	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		942	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		943	],
		944	["Weapons", 0, 6,
		945	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		946	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		947	["Bows" => CFClient::Pickup::PU_BOW],
		948	["Arrows" => CFClient::Pickup::PU_ARROW],
		949	],
		950	["Armour", 0, 12,
		951	["Helmets" => CFClient::Pickup::PU_HELMET],
		952	["Shields" => CFClient::Pickup::PU_SHIELD],
		953	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		954	["Boots" => CFClient::Pickup::PU_BOOTS],
		955	["Gloves" => CFClient::Pickup::PU_GLOVES],
		956	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		957	],
		958
		959	["Readables", 2, 2,
		960	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		961	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		962	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		963	],
		964	["Misc", 2, 7,
		965	["Food" => CFClient::Pickup::PU_FOOD],
		966	["Drinks" => CFClient::Pickup::PU_DRINK],
		967	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		968	["Keys" => CFClient::Pickup::PU_KEY],
		969	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		970	["Potions" => CFClient::Pickup::PU_POTION],
		971	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		972	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		973	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		974	],
		975	)
		976	{
		977	my ($title, $x, $y, @bits) = @$_;
		978	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		979
		980	for (@bits) {
		981	++$y;
		982
		983	my $mask = $_->[1];
		984	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		985	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		986	state => $CFG->{pickup} & $mask,
		987	on_changed => sub {
		988	my ($box, $value) = @_;
		989	if ($value) {
		990	$::CFG->{pickup} \|= $mask;
		991	} else {
		992	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		993	}
		994	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		995	if defined $::CONN;
		996	});
		997	}
		998	}
		999
		1000	$table
924	}	1001	}
925		1002
926	sub make_inventory_window {	1003	sub make_inventory_window {
927	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1005	x => "center",
		1006	y => "center",
928	def_w => $WIDTH * 7/8,	1007	force_w => $WIDTH * 9/10,
929	def_h => $HEIGHT * 7/8,	1008	force_h => $HEIGHT * 9/10,
930	title => "Inventory",	1009	title => "Inventory",
931	name => "inventory_window",
932	on_visibility_change => sub {
933	my ($self, $visible) = @_;
934	$self->center if $visible;
935	},
936	;	1010	;
937		1011
938	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939		1013
940	$hb->add (my $vb1 = new CFClient::UI::VBox);	1014	$hb->add (my $vb1 = new CFClient::UI::VBox);
…		…
951	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1025	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952		1026
953	$invwin	1027	$invwin
954	}	1028	}
955		1029
956	sub make_binding_window {	1030	sub spell_setup {
		1031	new CFClient::UI::SpellList
		1032	}
		1033
		1034	sub keyboard_setup {
957	my $binding_list = new CFClient::UI::VBox;	1035	my $binding_list = new CFClient::UI::VBox;
958		1036
		1037	my $refresh;
959	my $refresh = sub {	1038	$refresh = sub {
960	$binding_list->clear ();	1039	$binding_list->clear ();
961		1040
962	for my $mod (keys %{$::CFG->{bindings}}) {	1041	for my $mod (keys %{$::CFG->{bindings}}) {
963	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1042	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1043	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1044	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966		1045
967	my $lbl = join "; ", @$cmds;	1046	my $lbl = join "; ", @$cmds;
968	my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);	1047	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
969	$binding_list->add (my $hb = new CFClient::UI::HBox);	1048	$binding_list->add (my $hb = new CFClient::UI::HBox);
970	$hb->add (new CFClient::UI::Button	1049	$hb->add (new CFClient::UI::Button
971	text => "delete",	1050	text => "delete",
		1051	tooltip => "Deletes the binding",
972	on_activate => sub {	1052	on_activate => sub {
973	$binding_list->remove ($hb);	1053	$binding_list->remove ($hb);
974	delete $::CFG->{bindings}->{$mod}->{$sym};	1054	delete $::CFG->{bindings}->{$mod}->{$sym};
975	});	1055	});
		1056
		1057	$hb->add (new CFClient::UI::Button
		1058	text => "edit",
		1059	tooltip => "Edits the binding",
		1060	on_activate => sub {
		1061	$::BIND_EDITOR->set_binding (
		1062	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1063	sub {
		1064	my ($nmod, $nsym, $ncmds) = @_;
		1065	delete $::CFG->{bindings}->{$mod}->{$sym};
		1066	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1067	$refresh->();
		1068	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1069	$SETUP_DIALOG->show;
		1070	},
		1071	sub {
		1072	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1073	$SETUP_DIALOG->show;
		1074	});
		1075	$::BIND_EDITOR->show;
		1076	$SETUP_DIALOG->hide;
		1077	});
		1078
976	$hb->add (new CFClient::UI::Label text => "($nam)");	1079	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
977	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1080	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978	}	1081	}
979	}	1082	}
980	};	1083	};
981		1084
982	$BIND_WINDOW = new CFClient::UI::FancyFrame	1085	my $vb = new CFClient::UI::VBox;
983	title => "Bindings",	1086	$vb->add ($binding_list);
984	def_w => int $WIDTH * 7/8,	1087	$vb->add (my $hb = new CFClient::UI::HBox);
985	def_h => int $HEIGHT * 7/8,	1088
986	on_visibility_change => sub {	1089	$hb->add (new CFClient::UI::Button
987	my ($self, $visible) = @_;	1090	text => "record new",
988	if ($visible) {	1091	expand => 1,
989	$self->center;	1092	tooltip => "This button opens the binding editor with an empty binding.",
		1093	on_activate => sub {
		1094	$::BIND_EDITOR->set_binding (undef, undef, [],
		1095	sub {
		1096	my ($mod, $sym, $cmds) = @_;
		1097	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
990	$refresh->()	1098	$refresh->();
		1099	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1100	$SETUP_DIALOG->show;
		1101	},
		1102	sub {
		1103	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1104	$SETUP_DIALOG->show;
		1105	},
991	}	1106	);
		1107	$SETUP_DIALOG->hide;
		1108	$::BIND_EDITOR->show;
		1109	},
		1110	);
		1111
		1112	$hb->add (new CFClient::UI::Button
		1113	text => "close",
		1114	tooltip => "Closes the binding window",
		1115	expand => 1,
		1116	on_activate => sub {
		1117	$SETUP_DIALOG->hide;
992	};	1118	}
		1119	);
993		1120
994	$BIND_WINDOW->add ($binding_list);
995	$refresh->();	1121	$refresh->();
996	$BIND_WINDOW	1122
		1123	$vb
997	}	1124	}
998		1125
999	sub make_help_window {	1126	sub make_help_window {
1000	my $win = new CFClient::UI::FancyFrame	1127	my $win = new CFClient::UI::FancyFrame
		1128	x => 'center',
		1129	y => 'center',
		1130	z => 2,
		1131	name => 'doc_browser',
1001	def_w => int $WIDTH * 7/8,	1132	force_w => int $WIDTH * 7/8,
1002	def_h => int $HEIGHT * 7/8,	1133	force_h => int $HEIGHT * 7/8,
1003	title => "Documentation";	1134	title => "Documentation";
1004		1135
1005	$win->add (my $vbox = new CFClient::UI::VBox);	1136	$win->add (my $vbox = new CFClient::UI::VBox);
1006		1137
1007	$vbox->add (my $buttons = new CFClient::UI::HBox);	1138	$vbox->add (my $buttons = new CFClient::UI::HBox);
1008	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1139	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1016	my ($pod, $label) = @$_;	1147	my ($pod, $label) = @$_;
1017		1148
1018	$buttons->add (new CFClient::UI::Button	1149	$buttons->add (new CFClient::UI::Button
1019	text => $label,	1150	text => $label,
1020	on_activate => sub {	1151	on_activate => sub {
1021	my $parser = new Pod::POM;
1022	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1152	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";
1023		1153
1024	$viewer->clear;	1154	$viewer->clear;
1025		1155
1026	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1156	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1027	for @{ CFClient::pod_to_pango_list $pom };	1157	for @{ CFClient::pod_to_pango_list $pom };
…		…
1069	if ($DEBUG_STATUS) {	1199	if ($DEBUG_STATUS) {
1070	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1200	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071	} else {	1201	} else {
1072	# create the widgets	1202	# create the widgets
1073		1203
1074	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1204	$DEBUG_STATUS = new CFClient::UI::Label
		1205	padding => 0,
		1206	z => 100,
		1207	force_x => "max",
		1208	force_y => 0;
1075	$DEBUG_STATUS->show;	1209	$DEBUG_STATUS->show;
1076		1210
		1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1212
1077	$STATUSBOX = new CFClient::UI::Statusbox;	1213	$STATUSBOX = new CFClient::UI::Statusbox;
1078	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1079		1215
1080	(new CFClient::UI::Frame	1216	(new CFClient::UI::Frame
1081	bg => [0, 0, 0, 0.4],	1217	bg => [0, 0, 0, 0.4],
1082	req_y => -1,	1218	force_x => 0,
		1219	force_y => "max",
1083	child => $STATUSBOX,	1220	child => $STATUSBOX,
1084	)->show;	1221	)->show;
1085		1222
1086	CFClient::UI::FancyFrame->new (	1223	CFClient::UI::FancyFrame->new (
		1224	title => "Map",
		1225	name => "mapmap",
		1226	x => 0,
		1227	y => $FONTSIZE + 8,
1087	border_bg => [1, 1, 1, 192/255],	1228	border_bg => [1, 1, 1, 192/255],
1088	bg => [1, 1, 1, 0],	1229	bg => [1, 1, 1, 0],
1089	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1230	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1090	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1231	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091	),	1232	),
…		…
1114	can_hover => 1,	1255	can_hover => 1,
1115	can_events => 1,	1256	can_events => 1,
1116	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1257	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117	;	1258	;
1118		1259
		1260	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1261	title => "Setup",
		1262	name => "setup_dialog",
		1263	x => 'center',
		1264	y => 'center',
		1265	z => 2,
		1266	force_w => $::WIDTH * 0.6,
		1267	force_h => $::HEIGHT * 0.6,
		1268	;
		1269
		1270	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1271	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
		1272
		1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1274	"Configure the server to play on, your username, password and other server-related options.");
		1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
		1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1280	"Configure the use of audio, sound effects and background music.");
		1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1282	"Lets you define, edit and delete bindings."
		1283	. "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 "
		1285	. "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 "
		1287	. "binding editor closes");
		1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1290
1119	$BUTTONBAR = new CFClient::UI::HBox;	1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1120		1292
1121	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1122	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1123	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1295
1124	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1125	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1126	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1127		1298
1128	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	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
1129		1300
1130	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1131	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1132	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1133	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
		1305	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1134		1306
1135	$BUTTONBAR->add (new CFClient::UI::Button	1307	$BUTTONBAR->add (new CFClient::UI::Button
1136	text => "Save Config",	1308	text => "Save Config",
1137	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1138	on_activate => sub {	1310	on_activate => sub {
…		…
1142	},	1314	},
1143	);	1315	);
1144		1316
1145	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1146	tooltip => "View Documentation");	1318	tooltip => "View Documentation");
1147
1148	$BUTTONBAR->add (new CFClient::UI::Flopper
1149	text => "Bindings",
1150	other => make_binding_window,
1151	tooltip => "Lets you delete bindings you have made with the recorder"
1152	);
1153	$BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1154	tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1155		1319
1156	$BUTTONBAR->add (new CFClient::UI::Button	1320	$BUTTONBAR->add (new CFClient::UI::Button
1157	text => "Quit",	1321	text => "Quit",
1158	tooltip => "Terminates the program",	1322	tooltip => "Terminates the program",
1159	on_activate => sub {	1323	on_activate => sub {
…		…
1164	}	1328	}
1165	},	1329	},
1166	);	1330	);
1167		1331
1168	$BUTTONBAR->show;	1332	$BUTTONBAR->show;
		1333	$SETUP_DIALOG->show;
		1334	}
1169		1335
1170	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1336	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172	$SERVER_SETUP->show;
1173	}
1174	}	1337	}
1175		1338
1176	sub video_shutdown {	1339	sub video_shutdown {
1177	undef $SDL_ACTIVE;	1340	undef $SDL_ACTIVE;
1178	}	1341	}
…		…
1245		1408
1246	my %demo;#d#	1409	my %demo;#d#
1247		1410
1248	sub force_refresh {	1411	sub force_refresh {
1249	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1412	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1250	debug sprintf "%3.2f", $fps;	1413	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251		1414
1252	$CFClient::UI::ROOT->draw;	1415	$CFClient::UI::ROOT->draw;
1253		1416
1254	$WANT_REFRESH = 0;	1417	$WANT_REFRESH = 0;
1255	$CAN_REFRESH = 0;	1418	$CAN_REFRESH = 0;
…		…
1310	};	1473	};
1311		1474
1312	CFClient::SDL_GL_SwapBuffers;	1475	CFClient::SDL_GL_SwapBuffers;
1313	}	1476	}
1314		1477
1315	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1478	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1316	$NOW = time;	1479	$NOW = time;
1317		1480
1318	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1481	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1319	for CFClient::SDL_PollEvent;	1482	for CFClient::SDL_PollEvent;
1320		1483
…		…
1387	#############################################################################	1550	#############################################################################
1388		1551
1389	$SIG{INT} = $SIG{TERM} = sub { exit };	1552	$SIG{INT} = $SIG{TERM} = sub { exit };
1390		1553
1391	{	1554	{
1392	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };	1555	local $SIG{__DIE__} = sub {
		1556	return unless defined $^S && !$^S;
		1557	Carp::confess $_[1];#d#TODO: remove when stable
		1558	CFClient::fatal $_[0];
		1559	};
1393		1560
1394	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1395	CFClient::UI::set_layout ($::CFG->{layout});	1562	CFClient::UI::set_layout ($::CFG->{layout});
1396		1563
1397	my %DEF_CFG = (	1564	my %DEF_CFG = (
…		…
1488	=head1 USAGE	1655	=head1 USAGE
1489		1656
1490	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	1657	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1491	fullscreen and interactively.	1658	fullscreen and interactively.
1492		1659
		1660	=head1 DEBUGGING
		1661
		1662
		1663	CFPLUS_DEBUG - environment variable
		1664
		1665	1 draw borders around widgets
		1666	2 add low-level widget info to tooltips
		1667	4 show fps
		1668	8 suppress tooltips
		1669
1493	=head1 AUTHOR	1670	=head1 AUTHOR
1494		1671
1495	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1672	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1496		1673
1497		1674

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.29 by root, Mon May 29 21:54:16 2006 UTC vs. Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.29 by root, Mon May 29 21:54:16 2006 UTC vs.
Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC