[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.53 by root, Mon Jun 5 00:56:44 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;
86	our $SERVER_SETUP;	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;
87		94
88	our $FLOORBOX;	95	our $FLOORBOX;
89	our $GAUGES;	96	our $GAUGES;
90	our $STATWIDS;	97	our $STATWIDS;
91		98
…		…
101	our $DEBUG_STATUS;	108	our $DEBUG_STATUS;
102		109
103	our $INV_WINDOW;	110	our $INV_WINDOW;
104	our $INV;	111	our $INV;
105	our $INVR;	112	our $INVR;
106	our $INVR_LBL;	113	our $INV_RIGHT_HB;
		114
		115	our $BIND_EDITOR;
		116
		117	our $PICKUP_CFG;
107		118
108	sub status {	119	sub status {
109	$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]);
110	}	121	}
111		122
112	sub debug {	123	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	124	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);
116	}	125	}
117		126
118	sub start_game {	127	sub start_game {
119	status "logging in...";	128	status "logging in...";
120		129
121	$LOGIN_BUTTON->set_text ("Logout");	130	$LOGIN_BUTTON->set_text ("Logout");
122	$SERVER_SETUP->hide;	131	$SETUP_DIALOG->hide;
123		132
124	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;
125		134
126	my ($host, $port) = split /:/, $CFG->{host};	135	my ($host, $port) = split /:/, $CFG->{host};
127		136
…		…
165	}	174	}
166	}	175	}
167		176
168	sub stop_game {	177	sub stop_game {
169	$LOGIN_BUTTON->set_text ("Login");	178	$LOGIN_BUTTON->set_text ("Login");
170	$SERVER_SETUP->show;	179	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		180	$SETUP_DIALOG->show;
171	$INV_WINDOW->hide;	181	$INV_WINDOW->hide;
172	$LOGVIEW->hide;
173		182
174	return unless $CONN;	183	return unless $CONN;
175		184
176	status "connection closed";	185	status "connection closed";
177		186
178	$CONN->destroy;	187	$CONN->destroy;
179	$CONN = 0; # false, does not autovivify	188	$CONN = 0; # false, does not autovivify
180	}	189	}
181		190
182	sub client_setup {	191	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);	192	my $vbox = new CFClient::UI::VBox;
		193
189	$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]);
190		195
191	$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");
192	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		198
194	$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]);
195	$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");
196		201
197	$mode_slider->connect (changed => sub {	202	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	203	my ($self, $value) = @_;
199		204
…		…
316	on_activate => sub {	321	on_activate => sub {
317	video_shutdown ();	322	video_shutdown ();
318	video_init ();	323	video_init ();
319	}	324	}
320	);	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;
321		336
322	$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");
323	$table->add (1, $row++, new CFClient::UI::CheckBox	338	$table->add (1, $row++, new CFClient::UI::CheckBox
324	state => $CFG->{audio_enable},	339	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.",	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.",
…		…
356	audio_shutdown ();	371	audio_shutdown ();
357	audio_init ();	372	audio_init ();
358	}	373	}
359	);	374	);
360		375
361	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	376	$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	}	377	}
375		378
376	sub set_stats_window_fontsize {	379	sub set_stats_window_fontsize {
377	for (values %{$STATWIDS}) {	380	for (values %{$STATWIDS}) {
378	$_->set_fontsize ($::CFG->{stat_fontsize});	381	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
387		390
388	sub make_gauge_window {	391	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	392	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		393
391	my $win = new CFClient::UI::Frame (	394	my $win = new CFClient::UI::Frame (
392	req_x => 0,	395	force_x => 0,
393	req_y => -1,	396	force_y => "max",
394	def_w => $WIDTH,	397	force_w => $WIDTH,
395	def_h => $gh,	398	force_h => $gh,
396	);	399	);
397		400
398	$win->add (my $hbox = new CFClient::UI::HBox	401	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	402	children => [
400	(new CFClient::UI::HBox expand => 1),	403	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	439	&set_gauge_window_fontsize;
437		440
438	$win	441	$win
439	}	442	}
440		443
		444
441	sub make_stats_window {	445	sub make_stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	446	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	447	y => $HEIGHT * (2/8),
444	req_x => -1,	448	x => "max",
445	title => "Stats",	449	title => "Stats",
446	name => "stats_window";	450	name => "stats_window";
447		451
448	$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);
449	$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,
450	can_hover => 1, can_events => 1,	454	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.");	455	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 ({});	554	update_stats_window ({});
551		555
552	$tgw	556	$tgw
553	}	557	}
554		558
555	sub formsep {	559	sub formsep($) {
556	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	560	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
557	}	561	}
558		562
559	sub update_stats_window {	563	sub update_stats_window {
560	my ($stats) = @_;	564	my ($stats) = @_;
561		565
…		…
623		627
624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	628	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625	for keys %tbl;	629	for keys %tbl;
626	}	630	}
627		631
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;	632	my $METASERVER_ATIME;
639		633
640	sub update_metaserver {	634	sub update_metaserver {
641	my ($HOST) = @_;
642
643	return if $METASERVER_ATIME > time;	635	return if $METASERVER_ATIME > time;
644	$METASERVER_ATIME = time + 60;	636	$METASERVER_ATIME = time + 60;
645		637
646	my $table = $METASERVER->{table};	638	my $table = $METASERVER->{table};
647	$table->clear;	639	$table->clear;
…		…
699		691
700	$y++;	692	$y++;
701		693
702	$table->add (0, $y, new CFClient::UI::VBox children => [	694	$table->add (0, $y, new CFClient::UI::VBox children => [
703	(new CFClient::UI::Button text => "Use", on_activate => sub {	695	(new CFClient::UI::Button text => "Use", on_activate => sub {
704	$HOST->set_text ($CFG->{host} = $host);	696	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		697	$METASERVER->toggle_visibility;
705	}),	698	}),
706	(new CFClient::UI::Empty expand => 1),	699	(new CFClient::UI::Empty expand => 1),
707	]);	700	]);
708		701
709	$table->add ($_ + 1, $y, new CFClient::UI::Label	702	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
712	}	705	}
713	}	706	}
714	});	707	});
715	}	708	}
716		709
717	sub server_setup {	710	sub metaserver_dialog {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	711	my $dialog = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	712	title => "Server List",
720	y => $HEIGHT * (1/8),	713	name => 'metaserver_dialog',
721	name => "server_setup",	714	x => 'center',
722	title => "Server Setup",	715	y => 'center',
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	title => "Really Quit?",
		909	;
896		910
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		912
899	$vb->add (new CFClient::UI::Label	913	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	914	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	927	on_activate => sub { exit },
914	);	928	);
915	}	929	}
916		930
917	$QUIT_DIALOG->show;	931	$QUIT_DIALOG->show;
918	$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
919	}	1001	}
920		1002
921	sub make_inventory_window {	1003	sub make_inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1005	x => "center",
		1006	y => "center",
923	def_w => $WIDTH * 7/8,	1007	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	1008	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	1009	title => "Inventory",
926	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	1010	;
932		1011
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		1013
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	1014	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1015	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1016	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		1017
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	1018	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		1019
		1020	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1021
		1022	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1023
		1024	# XXX: Call after $INVR = ... because set_opencont sets the items
		1025	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1026
		1027	$invwin
		1028	}
		1029
		1030	sub spell_setup {
		1031	new CFClient::UI::SpellList
		1032	}
		1033
		1034	sub keyboard_setup {
		1035	my $binding_list = new CFClient::UI::VBox;
		1036
		1037	my $refresh;
		1038	$refresh = sub {
		1039	$binding_list->clear ();
		1040
		1041	for my $mod (keys %{$::CFG->{bindings}}) {
		1042	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1043	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1044	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1045
		1046	my $lbl = join "; ", @$cmds;
		1047	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1048	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1049	$hb->add (new CFClient::UI::Button
		1050	text => "delete",
		1051	tooltip => "Deletes the binding",
		1052	on_activate => sub {
		1053	$binding_list->remove ($hb);
		1054	delete $::CFG->{bindings}->{$mod}->{$sym};
		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
		1079	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1080	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1081	}
		1082	}
		1083	};
		1084
		1085	my $vb = new CFClient::UI::VBox;
		1086	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1087	$vb->add (my $hb = new CFClient::UI::HBox);
942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");	1088
943	$hb2->add (new CFClient::UI::Button	1089	$hb->add (new CFClient::UI::Button
944	text => "Close",	1090	text => "record new",
945	tooltip => "Close the currently open container (if one is open)",	1091	expand => 1,
		1092	tooltip => "This button opens the binding editor with an empty binding.",
946	on_activate => sub {	1093	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1094	$::BIND_EDITOR->set_binding (undef, undef, [],
948	if $CONN->{open_container} != 0;	1095	sub {
		1096	my ($mod, $sym, $cmds) = @_;
		1097	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		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	},
		1106	);
		1107	$SETUP_DIALOG->hide;
		1108	$::BIND_EDITOR->show;
949	},	1109	},
950	);	1110	);
951		1111
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	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;
		1118	}
		1119	);
953		1120
954	$invwin	1121	$refresh->();
		1122
		1123	$vb
955	}	1124	}
956		1125
957	sub make_help_window {	1126	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1127	my $win = new CFClient::UI::FancyFrame
		1128	x => 'center',
		1129	y => 'center',
		1130	name => 'doc_browser',
959	def_w => int $WIDTH * 7/8,	1131	force_w => int $WIDTH * 7/8,
960	def_h => int $HEIGHT * 7/8,	1132	force_h => int $HEIGHT * 7/8,
961	title => "Documentation";	1133	title => "Documentation";
962		1134
963	$win->add (my $vbox = new CFClient::UI::VBox);	1135	$win->add (my $vbox = new CFClient::UI::VBox);
964		1136
965	$vbox->add (my $buttons = new CFClient::UI::HBox);	1137	$vbox->add (my $buttons = new CFClient::UI::HBox);
966	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1138	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1027	if ($DEBUG_STATUS) {	1199	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1200	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1201	} else {
1030	# create the widgets	1202	# create the widgets
1031		1203
1032	$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;
1033	$DEBUG_STATUS->show;	1209	$DEBUG_STATUS->show;
1034		1210
		1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1212
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1213	$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]);	1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1037		1215
1038	(new CFClient::UI::Frame	1216	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1217	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1218	force_x => 0,
		1219	force_y => "max",
1041	child => $STATUSBOX,	1220	child => $STATUSBOX,
1042	)->show;	1221	)->show;
1043		1222
1044	CFClient::UI::FancyFrame->new (	1223	CFClient::UI::FancyFrame->new (
		1224	title => "Map",
		1225	name => "mapmap",
		1226	x => 0,
		1227	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1228	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1229	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1230	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.",	1231	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1232	),
…		…
1072	can_hover => 1,	1255	can_hover => 1,
1073	can_events => 1,	1256	can_events => 1,
1074	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.",
1075	;	1258	;
1076		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: Left Control + Insert opens the binding editor "
		1284	. "with nothing set and the recording started. After doing the actions you "
		1285	. "want to record press Insert and you will be asked to press a key-combo. "
		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
1077	$BUTTONBAR = new CFClient::UI::HBox;	1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078		1292
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1293	$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.");	1294	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,	1295
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,	1296	$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.");	1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085		1298
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	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
1087		1300
1088	$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,
1089	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.");
1090	$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,
1091	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.");
1092		1306
1093	$BUTTONBAR->add (new CFClient::UI::Button	1307	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1308	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.",	1309	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 {	1310	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1311	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1313	status "Configuration Saved";
1100	},	1314	},
1101	);	1315	);
1102		1316
1103	$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,
…		…
1114	}	1328	}
1115	},	1329	},
1116	);	1330	);
1117		1331
1118	$BUTTONBAR->show;	1332	$BUTTONBAR->show;
		1333	$SETUP_DIALOG->show;
		1334	}
1119		1335
1120	$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]);
1121
1122	$SERVER_SETUP->show;
1123	}
1124	}	1337	}
1125		1338
1126	sub video_shutdown {	1339	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1340	undef $SDL_ACTIVE;
1128	}	1341	}
…		…
1195		1408
1196	my %demo;#d#	1409	my %demo;#d#
1197		1410
1198	sub force_refresh {	1411	sub force_refresh {
1199	$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;
1200	debug sprintf "%3.2f", $fps;	1413	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1414
1202	$CFClient::UI::ROOT->draw;	1415	$CFClient::UI::ROOT->draw;
1203		1416
1204	$WANT_REFRESH = 0;	1417	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1418	$CAN_REFRESH = 0;
…		…
1260	};	1473	};
1261		1474
1262	CFClient::SDL_GL_SwapBuffers;	1475	CFClient::SDL_GL_SwapBuffers;
1263	}	1476	}
1264		1477
1265	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 {
1266	$NOW = time;	1479	$NOW = time;
1267		1480
1268	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1481	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1269	for CFClient::SDL_PollEvent;	1482	for CFClient::SDL_PollEvent;
1270		1483
…		…
1337	#############################################################################	1550	#############################################################################
1338		1551
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1552	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1553
1341	{	1554	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	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	};
1343		1560
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1562	CFClient::UI::set_layout ($::CFG->{layout});
1346		1563
1347	my %DEF_CFG = (	1564	my %DEF_CFG = (
1348	sdl_mode => 0,	1565	sdl_mode => 0,
1349	width => 640,	1566	width => 640,
…		…
1427		1644
1428	END { CFClient::SDL_Quit }	1645	END { CFClient::SDL_Quit }
1429		1646
1430	=head1 NAME	1647	=head1 NAME
1431		1648
1432	pclient - A Crossfire+ and Crossfire game client	1649	cfplus - A Crossfire+ and Crossfire game client
1433		1650
1434	=head1 SYNOPSIS	1651	=head1 SYNOPSIS
1435		1652
1436	Just run it - no commandline arguments are supported.	1653	Just run it - no commandline arguments are supported.
1437		1654
1438	=head1 USAGE	1655	=head1 USAGE
1439		1656
1440	Pclient 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
1441	fullscreen and interactively.	1658	fullscreen and interactively.
1442		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
1443	=head1 AUTHOR	1670	=head1 AUTHOR
1444		1671
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1672	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1673
1447		1674

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.53 by root, Mon Jun 5 00:56:44 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.53 by root, Mon Jun 5 00:56:44 2006 UTC