[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.48 by root, Fri Jun 2 21:46:45 2006 UTC

…		…
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 $HOST_ENTRY;
86	our $SERVER_SETUP;	87	our $SERVER_SETUP;
87		88
88	our $FLOORBOX;	89	our $FLOORBOX;
89	our $GAUGES;	90	our $GAUGES;
90	our $STATWIDS;	91	our $STATWIDS;
…		…
101	our $DEBUG_STATUS;	102	our $DEBUG_STATUS;
102		103
103	our $INV_WINDOW;	104	our $INV_WINDOW;
104	our $INV;	105	our $INV;
105	our $INVR;	106	our $INVR;
106	our $INVR_LBL;	107	our $INV_RIGHT_HB;
		108
		109	our $BIND_WINDOW;
		110	our $BIND_EDITOR;
		111
		112	our $SPELL_LIST;
		113	our $PICKUP_CFG;
107		114
108	sub status {	115	sub status {
109	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	116	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110	}	117	}
111		118
112	sub debug {	119	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	120	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);
116	}	121	}
117		122
118	sub start_game {	123	sub start_game {
119	status "logging in...";	124	status "logging in...";
120		125
…		…
179	$CONN = 0; # false, does not autovivify	184	$CONN = 0; # false, does not autovivify
180	}	185	}
181		186
182	sub client_setup {	187	sub client_setup {
183	my $dialog = new CFClient::UI::FancyFrame	188	my $dialog = new CFClient::UI::FancyFrame
184	req_x => 1,	189	x => 1,
185	req_y => $HEIGHT * (1/8),	190	y => $HEIGHT * (1/8),
186	name => "client_setup",	191	name => "client_setup",
187	title => "Client Setup",	192	title => "Client Setup",
188	child => (my $vbox = new CFClient::UI::VBox);	193	child => (my $vbox = new CFClient::UI::VBox);
		194
189	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	195	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
190		196
191	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	197	$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);	198	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		199
194	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	200	$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");	201	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196		202
197	$mode_slider->connect (changed => sub {	203	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	204	my ($self, $value) = @_;
199		205
…		…
387		393
388	sub make_gauge_window {	394	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	395	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		396
391	my $win = new CFClient::UI::Frame (	397	my $win = new CFClient::UI::Frame (
392	req_x => 0,	398	force_x => 0,
393	req_y => -1,	399	force_y => "max",
394	def_w => $WIDTH,	400	force_w => $WIDTH,
395	def_h => $gh,	401	force_h => $gh,
396	);	402	);
397		403
398	$win->add (my $hbox = new CFClient::UI::HBox	404	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	405	children => [
400	(new CFClient::UI::HBox expand => 1),	406	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	442	&set_gauge_window_fontsize;
437		443
438	$win	444	$win
439	}	445	}
440		446
		447
441	sub make_stats_window {	448	sub make_stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	449	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	450	y => $HEIGHT * (2/8),
444	req_x => -1,	451	x => "max",
445	title => "Stats",	452	title => "Stats",
446	name => "stats_window";	453	name => "stats_window";
447		454
448	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	455	$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,	456	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450	can_hover => 1, can_events => 1,	457	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.");	458	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 ({});	557	update_stats_window ({});
551		558
552	$tgw	559	$tgw
553	}	560	}
554		561
555	sub formsep {	562	sub formsep($) {
556	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	563	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
557	}	564	}
558		565
559	sub update_stats_window {	566	sub update_stats_window {
560	my ($stats) = @_;	567	my ($stats) = @_;
561		568
…		…
623		630
624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	631	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625	for keys %tbl;	632	for keys %tbl;
626	}	633	}
627		634
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;	635	my $METASERVER_ATIME;
639		636
640	sub update_metaserver {	637	sub update_metaserver {
641	my ($HOST) = @_;
642
643	return if $METASERVER_ATIME > time;	638	return if $METASERVER_ATIME > time;
644	$METASERVER_ATIME = time + 60;	639	$METASERVER_ATIME = time + 60;
645		640
646	my $table = $METASERVER->{table};	641	my $table = $METASERVER->{table};
647	$table->clear;	642	$table->clear;
…		…
699		694
700	$y++;	695	$y++;
701		696
702	$table->add (0, $y, new CFClient::UI::VBox children => [	697	$table->add (0, $y, new CFClient::UI::VBox children => [
703	(new CFClient::UI::Button text => "Use", on_activate => sub {	698	(new CFClient::UI::Button text => "Use", on_activate => sub {
704	$HOST->set_text ($CFG->{host} = $host);	699	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		700	$METASERVER->toggle_visibility;
705	}),	701	}),
706	(new CFClient::UI::Empty expand => 1),	702	(new CFClient::UI::Empty expand => 1),
707	]);	703	]);
708		704
709	$table->add ($_ + 1, $y, new CFClient::UI::Label	705	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
712	}	708	}
713	}	709	}
714	});	710	});
715	}	711	}
716		712
		713	sub metaserver_dialog {
		714	my $dialog = new CFClient::UI::FancyFrame
		715	title => "Server List",
		716	name => 'metaserver_dialog',
		717	x => 'center',
		718	y => 'center',
		719	child => (my $vbox = new CFClient::UI::VBox),
		720	on_visibility_change => sub {
		721	update_metaserver if $_[1];
		722	},
		723	;
		724
		725	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		726
		727	$dialog
		728	}
		729
717	sub server_setup {	730	sub server_setup {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	731	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	732	x => "center",
720	y => $HEIGHT * (1/8),	733	y => "center",
721	name => "server_setup",	734	name => "server_setup",
722	title => "Server Setup",	735	title => "Server Setup",
723	child => (my $vbox = new CFClient::UI::VBox),	736	child => (my $vbox = new CFClient::UI::VBox),
724	on_visibility_change => sub {
725	my ($self, $visible) = @_;
726	$self->center if $visible;
727	},
728	;	737	;
729		738
730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	739	$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");	740	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732		741
733	{	742	{
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	743	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735		744
736	$vbox->add (	745	$vbox->add (
737	my $HOST = new CFClient::UI::Entry	746	$HOST_ENTRY = new CFClient::UI::Entry
738	expand => 1,	747	expand => 1,
739	text => $CFG->{host},	748	text => $CFG->{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	749	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	750	on_changed => sub {
742	my ($self, $value) = @_;	751	my ($self, $value) = @_;
…		…
744	}	753	}
745	);	754	);
746		755
747	$METASERVER = metaserver_dialog;	756	$METASERVER = metaserver_dialog;
748		757
749	$vbox->add (new CFClient::UI::Flopper	758	$vbox->add (new CFClient::UI::Button
750	expand => 1,	759	expand => 1,
751	text => "Server List",	760	text => "Server List",
752	other => $METASERVER,	761	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	762	tooltip => "Show a list of available crossfire servers",
754	on_open => sub {	763	on_activate => sub { $METASERVER->toggle_visibility },
755	update_metaserver $HOST;
756	}
757	);	764	);
758	}	765	}
759		766
760	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	767	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761	$table->add (1, 4, new CFClient::UI::Entry	768	$table->add (1, 4, new CFClient::UI::Entry
…		…
778	}	785	}
779	);	786	);
780		787
781	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	788	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782	$table->add (1, 7, new CFClient::UI::Slider	789	$table->add (1, 7, new CFClient::UI::Slider
783	req_w => 100,	790	force_w => 100,
784	range => [$CFG->{mapsize}, 10, 100, 0, 1],	791	range => [$CFG->{mapsize}, 10, 100, 0, 1],
785	tooltip => "This is the size of the portion of the map update the server sends you. "	792	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, "	793	. "If you set this to a high value you will be able to see further, "
787	. "but you also increase bandwidth requirements and latency. "	794	. "but you also increase bandwidth requirements and latency. "
788	. "This option is only used once at log-in.",	795	. "This option is only used once at log-in.",
…		…
837	my $window = new CFClient::UI::FancyFrame	844	my $window = new CFClient::UI::FancyFrame
838	name => "message_window",	845	name => "message_window",
839	title => "Messages",	846	title => "Messages",
840	border_bg => [1, 1, 1, 1],	847	border_bg => [1, 1, 1, 1],
841	bg => [0, 0, 0, 0.75],	848	bg => [0, 0, 0, 0.75],
842	req_x => -1,	849	x => "max",
843	req_y => 0,	850	y => 0,
844	def_w => int $::WIDTH / 3,	851	force_w => $::WIDTH / 3,
845	def_h => int $::HEIGHT / 5,	852	force_h => $::HEIGHT / 5,
846	child => (my $vbox = new CFClient::UI::VBox);	853	child => (my $vbox = new CFClient::UI::VBox);
847		854
848	$vbox->add ($LOGVIEW);	855	$vbox->add ($LOGVIEW);
849		856
850	$vbox->add (my $input = new CFClient::UI::Entry	857	$vbox->add (my $input = new CFClient::UI::Entry
…		…
882	},	889	},
883	);	890	);
884		891
885	$CONSOLE = {	892	$CONSOLE = {
886	window => $window,	893	window => $window,
887	input => $input	894	input => $input,
888	};	895	};
889		896
890	$window	897	$window
891	}	898	}
892		899
893	sub open_quit_dialog {	900	sub open_quit_dialog {
894	unless ($QUIT_DIALOG) {	901	unless ($QUIT_DIALOG) {
895	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	902	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		903	x => "center",
		904	y => "center",
		905	title => "Really Quit?",
		906	;
896		907
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	908	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		909
899	$vb->add (new CFClient::UI::Label	910	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	911	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	924	on_activate => sub { exit },
914	);	925	);
915	}	926	}
916		927
917	$QUIT_DIALOG->show;	928	$QUIT_DIALOG->show;
918	$QUIT_DIALOG->center;	929	}
		930
		931	sub make_pickup_cfg_window {
		932	$PICKUP_CFG = new CFClient::UI::FancyFrame
		933	title => "Autopickup configuration",
		934	x => "center",
		935	y => "center",
		936	force_w => $WIDTH * 6/10,
		937	force_h => $HEIGHT * 9/10;
		938
		939
		940	$PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
		941	$vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
		942	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		943	$hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
		944	$hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
		945
		946	my $tbl = 0;
		947	my $tblrow = 0;
		948
		949	for (
		950	["General", $gen_tbl],
		951	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
		952	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		953	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		954	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		955	["Weapons", $ltbl],
		956	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		957	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		958	["Bows" => CFClient::Pickup::PU_BOW],
		959	["Arrows" => CFClient::Pickup::PU_ARROW],
		960	["Armour"],
		961	["Helmets" => CFClient::Pickup::PU_HELMET],
		962	["Shields" => CFClient::Pickup::PU_SHIELD],
		963	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		964	["Boots" => CFClient::Pickup::PU_BOOTS],
		965	["Gloves" => CFClient::Pickup::PU_GLOVES],
		966	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		967	["Readables", $rtbl],
		968	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		969	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		970	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		971	["Misc"],
		972	["Food" => CFClient::Pickup::PU_FOOD],
		973	["Drinks" => CFClient::Pickup::PU_DRINK],
		974	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		975	["Keys" => CFClient::Pickup::PU_KEY],
		976	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		977	["Potions" => CFClient::Pickup::PU_POTION],
		978	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		979	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		980	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		981	)
		982	{
		983	if (ref $_->[1]) {
		984	$tbl = $_->[1];
		985	$tblrow = 0;
		986	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
		987	} elsif (not defined $_->[1]) {
		988	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
		989	} else {
		990	my $mask = $_->[1];
		991	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		992	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
		993	state => $CFG->{pickup} & $mask,
		994	on_changed => sub {
		995	my ($box, $value) = @_;
		996	if ($value) {
		997	$::CFG->{pickup} \|= $mask;
		998	} else {
		999	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		1000	}
		1001	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		1002	if defined $::CONN;
		1003	});
		1004	}
		1005	}
		1006
		1007	$PICKUP_CFG
919	}	1008	}
920		1009
921	sub make_inventory_window {	1010	sub make_inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1011	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1012	x => "center",
		1013	y => "center",
923	def_w => $WIDTH * 7/8,	1014	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	1015	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	1016	title => "Inventory",
926	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	1017	;
932		1018
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1019	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		1020
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	1021	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1022	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1023	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		1024
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	1025	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		1026
		1027	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1028
		1029	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1030
		1031	# XXX: Call after $INVR = ... because set_opencont sets the items
		1032	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1033
		1034	$invwin
		1035	}
		1036
		1037	sub make_spell_list {
		1038	$SPELL_LIST = new CFClient::UI::SpellList
		1039	force_w => $WIDTH * (9/10),
		1040	force_h => $HEIGHT * (9/10);
		1041	$SPELL_LIST
		1042	}
		1043
		1044	sub make_binding_window {
		1045	my $binding_list = new CFClient::UI::VBox;
		1046
		1047	my $refresh;
		1048	$refresh = sub {
		1049	$binding_list->clear ();
		1050
		1051	for my $mod (keys %{$::CFG->{bindings}}) {
		1052	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1053	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1054	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1055
		1056	my $lbl = join "; ", @$cmds;
		1057	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1058	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1059	$hb->add (new CFClient::UI::Button
		1060	text => "delete",
		1061	tooltip => "Deletes the binding",
		1062	on_activate => sub {
		1063	$binding_list->remove ($hb);
		1064	delete $::CFG->{bindings}->{$mod}->{$sym};
		1065	});
		1066
		1067	$hb->add (new CFClient::UI::Button
		1068	text => "edit",
		1069	tooltip => "Edits the binding",
		1070	on_activate => sub {
		1071	$::BIND_EDITOR->set_binding (
		1072	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1073	sub {
		1074	my ($nmod, $nsym, $ncmds) = @_;
		1075	delete $::CFG->{bindings}->{$mod}->{$sym};
		1076	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1077	$refresh->();
		1078	$::BIND_WINDOW->show;
		1079	},
		1080	sub {
		1081	$::BIND_WINDOW->show;
		1082	});
		1083	$::BIND_EDITOR->show;
		1084	$::BIND_WINDOW->hide;
		1085	});
		1086
		1087	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1088	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1089	}
		1090	}
		1091	};
		1092
		1093	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1094	title => "Bindings",
		1095	x => "center",
		1096	y => "center",
		1097	def_w => int $WIDTH * 9/10,
		1098	def_h => int $HEIGHT * 9/10,
		1099	on_visibility_change => sub {
		1100	my ($self, $visible) = @_;
		1101	$refresh->() if $visible;
		1102	};
		1103
		1104	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1105	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1106	$vb->add (my $hb = new CFClient::UI::HBox);
942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
943	$hb2->add (new CFClient::UI::Button	1107	$hb->add (new CFClient::UI::Button
944	text => "Close",	1108	text => "record new",
945	tooltip => "Close the currently open container (if one is open)",	1109	expand => 1,
		1110	tooltip => "This button opens the binding editor with an empty binding.",
946	on_activate => sub {	1111	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1112	$::BIND_EDITOR->set_binding (undef, undef, [],
948	if $CONN->{open_container} != 0;	1113	sub {
		1114	my ($mod, $sym, $cmds) = @_;
		1115	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1116	$refresh->();
		1117	$::BIND_WINDOW->show;
		1118	},
		1119	sub {
		1120	$::BIND_WINDOW->show;
		1121	});
		1122	$::BIND_WINDOW->hide;
		1123	$::BIND_EDITOR->show;
949	},	1124	},
950	);	1125	);
		1126	$hb->add (new CFClient::UI::Button
		1127	text => "close",
		1128	tooltip => "Closes the binding window",
		1129	expand => 1,
		1130	on_activate => sub {
		1131	$::BIND_WINDOW->hide;
		1132	}
		1133	);
951		1134
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1135	$refresh->();
953		1136	$BIND_WINDOW
954	$invwin
955	}	1137	}
956		1138
957	sub make_help_window {	1139	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1140	my $win = new CFClient::UI::FancyFrame
		1141	x => 'center',
		1142	y => 'center',
		1143	name => 'doc_browser',
959	def_w => int $WIDTH * 7/8,	1144	force_w => int $WIDTH * 7/8,
960	def_h => int $HEIGHT * 7/8,	1145	force_h => int $HEIGHT * 7/8,
961	title => "Documentation";	1146	title => "Documentation";
962		1147
963	$win->add (my $vbox = new CFClient::UI::VBox);	1148	$win->add (my $vbox = new CFClient::UI::VBox);
964		1149
965	$vbox->add (my $buttons = new CFClient::UI::HBox);	1150	$vbox->add (my $buttons = new CFClient::UI::HBox);
966	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1151	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1027	if ($DEBUG_STATUS) {	1212	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1213	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1214	} else {
1030	# create the widgets	1215	# create the widgets
1031		1216
1032	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1217	$DEBUG_STATUS = new CFClient::UI::Label
		1218	padding => 0,
		1219	z => 100,
		1220	force_x => "max",
		1221	force_y => 0;
1033	$DEBUG_STATUS->show;	1222	$DEBUG_STATUS->show;
1034		1223
		1224	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1225
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1226	$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]);	1227	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1037		1228
1038	(new CFClient::UI::Frame	1229	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1230	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1231	force_x => 0,
		1232	force_y => "max",
1041	child => $STATUSBOX,	1233	child => $STATUSBOX,
1042	)->show;	1234	)->show;
1043		1235
1044	CFClient::UI::FancyFrame->new (	1236	CFClient::UI::FancyFrame->new (
		1237	title => "Map",
		1238	name => "mapmap",
		1239	x => 0,
		1240	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1241	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1242	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1243	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.",	1244	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1245	),
…		…
1072	can_hover => 1,	1268	can_hover => 1,
1073	can_events => 1,	1269	can_events => 1,
1074	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1270	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075	;	1271	;
1076		1272
1077	$BUTTONBAR = new CFClient::UI::HBox;	1273	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078		1274
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1275	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1080	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1276	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1277	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1082	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1278	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
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	1282	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		1283
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1284	$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.");	1285	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,	1286	$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 :).");	1287	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1288	."You can also hit the Tab-key to show/hide the Inventory.");
1092		1289
1093	$BUTTONBAR->add (new CFClient::UI::Button	1290	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1291	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.",	1292	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 {	1293	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1294	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1295	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1296	status "Configuration Saved";
1100	},	1297	},
1101	);	1298	);
1102		1299
1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1300	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1104	tooltip => "View Documentation");	1301	tooltip => "View Documentation");
		1302
		1303	$BUTTONBAR->add (new CFClient::UI::Flopper
		1304	text => "Bindings",
		1305	other => make_binding_window,
		1306	tooltip =>
		1307	"Lets you define, edit and delete bindings."
		1308	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1309	."with nothing set and the recording started. After doing the actions you "
		1310	."want to record press Insert and you will be asked to press a key-combo."
		1311	."After pressing the combo the binding will be saved automatically and the "
		1312	."binding editor closes");
		1313
		1314	$BUTTONBAR->add (new CFClient::UI::Flopper
		1315	text => "Spells",
		1316	other => make_spell_list,
		1317	tooltip => "The spell list");
		1318
		1319	$BUTTONBAR->add (new CFClient::UI::Flopper
		1320	text => "Pickup",
		1321	other => make_pickup_cfg_window,
		1322	tooltip => "The pickup dialog");
		1323
1105		1324
1106	$BUTTONBAR->add (new CFClient::UI::Button	1325	$BUTTONBAR->add (new CFClient::UI::Button
1107	text => "Quit",	1326	text => "Quit",
1108	tooltip => "Terminates the program",	1327	tooltip => "Terminates the program",
1109	on_activate => sub {	1328	on_activate => sub {
…		…
1114	}	1333	}
1115	},	1334	},
1116	);	1335	);
1117		1336
1118	$BUTTONBAR->show;	1337	$BUTTONBAR->show;
		1338	$SERVER_SETUP->show;
1119		1339
1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1340	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122	$SERVER_SETUP->show;
1123	}	1341	}
1124	}	1342	}
1125		1343
1126	sub video_shutdown {	1344	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1345	undef $SDL_ACTIVE;
…		…
1195		1413
1196	my %demo;#d#	1414	my %demo;#d#
1197		1415
1198	sub force_refresh {	1416	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1417	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1418	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1419
1202	$CFClient::UI::ROOT->draw;	1420	$CFClient::UI::ROOT->draw;
1203		1421
1204	$WANT_REFRESH = 0;	1422	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1423	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1555	#############################################################################
1338		1556
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1557	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1558
1341	{	1559	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1560	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1561
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1562	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1563	CFClient::UI::set_layout ($::CFG->{layout});
1346		1564
1347	my %DEF_CFG = (	1565	my %DEF_CFG = (
1348	sdl_mode => 0,	1566	sdl_mode => 0,
1349	width => 640,	1567	width => 640,
…		…
1427		1645
1428	END { CFClient::SDL_Quit }	1646	END { CFClient::SDL_Quit }
1429		1647
1430	=head1 NAME	1648	=head1 NAME
1431		1649
1432	pclient - A Crossfire+ and Crossfire game client	1650	cfplus - A Crossfire+ and Crossfire game client
1433		1651
1434	=head1 SYNOPSIS	1652	=head1 SYNOPSIS
1435		1653
1436	Just run it - no commandline arguments are supported.	1654	Just run it - no commandline arguments are supported.
1437		1655
1438	=head1 USAGE	1656	=head1 USAGE
1439		1657
1440	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
1441	fullscreen and interactively.	1659	fullscreen and interactively.
1442		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
1443	=head1 AUTHOR	1671	=head1 AUTHOR
1444		1672
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1673	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1674
1447		1675

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.48 by root, Fri Jun 2 21:46:45 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.48 by root, Fri Jun 2 21:46:45 2006 UTC