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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.41 by root, Fri Jun 2 02:21:48 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;
		87	our $SERVER_SETUP;
86		88
87	our $FLOORBOX;	89	our $FLOORBOX;
88	our $GAUGES;	90	our $GAUGES;
89	our $STATWIDS;	91	our $STATWIDS;
90		92
…		…
97		99
98	our $ALT_ENTER_MESSAGE;	100	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	101	our $STATUSBOX;
100	our $DEBUG_STATUS;	102	our $DEBUG_STATUS;
101		103
		104	our $INV_WINDOW;
102	our $INV;	105	our $INV;
103	our $INVR;	106	our $INVR;
104	our $INVR_LBL;	107	our $INV_RIGHT_HB;
		108
		109	our $BIND_WINDOW;
		110	our $BIND_EDITOR;
		111
		112	our $SPELL_LIST;
105		113
106	sub status {	114	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	115	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	116	}
109		117
110	sub debug {	118	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	119	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	120	}
115		121
116	sub start_game {	122	sub start_game {
117	status "logging in...";	123	status "logging in...";
		124
		125	$LOGIN_BUTTON->set_text ("Logout");
		126	$SERVER_SETUP->hide;
118		127
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	128	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		129
121	my ($host, $port) = split /:/, $CFG->{host};	130	my ($host, $port) = split /:/, $CFG->{host};
122		131
…		…
151	};	160	};
152		161
153	if ($CONN) {	162	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	163	CFClient::lowdelay fileno $CONN->{fh};
155		164
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	165	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	166	} else {
163	status "unable to connect";	167	status "unable to connect";
164	stop_game();	168	stop_game();
165	}	169	}
166	}	170	}
167		171
168	sub stop_game {	172	sub stop_game {
		173	$LOGIN_BUTTON->set_text ("Login");
		174	$SERVER_SETUP->show;
		175	$INV_WINDOW->hide;
		176	$LOGVIEW->hide;
		177
169	return unless $CONN;	178	return unless $CONN;
170		179
171	status "connection closed";	180	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	181
173	$CONN->destroy;	182	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	183	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	184	}
179		185
180	sub client_setup {	186	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	187	my $dialog = new CFClient::UI::FancyFrame
		188	x => 1,
		189	y => $HEIGHT * (1/8),
182	name => "client_setup",	190	name => "client_setup",
183	title => "Client Setup",	191	title => "Client Setup",
184	child => (my $vbox = new CFClient::UI::VBox);	192	child => (my $vbox = new CFClient::UI::VBox);
		193
185	$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]);
186		195
187	$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");
188	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189		198
190	$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]);
191	$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");
192		201
193	$mode_slider->connect (changed => sub {	202	$mode_slider->connect (changed => sub {
194	my ($self, $value) = @_;	203	my ($self, $value) = @_;
195		204
…		…
383		392
384	sub make_gauge_window {	393	sub make_gauge_window {
385	my $gh = int $HEIGHT * $CFG->{gauge_size};	394	my $gh = int $HEIGHT * $CFG->{gauge_size};
386		395
387	my $win = new CFClient::UI::Frame (	396	my $win = new CFClient::UI::Frame (
388	req_y => -1,	397	force_x => 0,
		398	force_y => "max",
389	user_w => $WIDTH,	399	force_w => $WIDTH,
390	user_h => $gh,	400	force_h => $gh,
391	);	401	);
392		402
393	$win->add (my $hbox = new CFClient::UI::HBox	403	$win->add (my $hbox = new CFClient::UI::HBox
394	children => [	404	children => [
395	(new CFClient::UI::HBox expand => 1),	405	(new CFClient::UI::HBox expand => 1),
…		…
431	&set_gauge_window_fontsize;	441	&set_gauge_window_fontsize;
432		442
433	$win	443	$win
434	}	444	}
435		445
		446
436	sub make_stats_window {	447	sub make_stats_window {
437	my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window";	448	my $tgw = new CFClient::UI::FancyFrame
		449	y => $HEIGHT * (2/8),
		450	x => "max",
		451	title => "Stats",
		452	name => "stats_window";
438		453
439	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	454	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	455	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441	can_hover => 1, can_events => 1,	456	can_hover => 1, can_events => 1,
442	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	457	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
614		629
615	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	630	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616	for keys %tbl;	631	for keys %tbl;
617	}	632	}
618		633
619	sub metaserver_dialog {
620	my $dialog = new CFClient::UI::FancyFrame
621	title => "Server List",
622	child => (my $vbox = new CFClient::UI::VBox);
623
624	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626	$dialog
627	}
628
629	my $METASERVER_ATIME;	634	my $METASERVER_ATIME;
630		635
631	sub update_metaserver {	636	sub update_metaserver {
632	my ($HOST) = @_;
633
634	return if $METASERVER_ATIME > time;	637	return if $METASERVER_ATIME > time;
635	$METASERVER_ATIME = time + 60;	638	$METASERVER_ATIME = time + 60;
636		639
637	my $table = $METASERVER->{table};	640	my $table = $METASERVER->{table};
638	$table->clear;	641	$table->clear;
…		…
690		693
691	$y++;	694	$y++;
692		695
693	$table->add (0, $y, new CFClient::UI::VBox children => [	696	$table->add (0, $y, new CFClient::UI::VBox children => [
694	(new CFClient::UI::Button text => "Use", on_activate => sub {	697	(new CFClient::UI::Button text => "Use", on_activate => sub {
695	$HOST->set_text ($CFG->{host} = $host);	698	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		699	$METASERVER->toggle_visibility;
696	}),	700	}),
697	(new CFClient::UI::Empty expand => 1),	701	(new CFClient::UI::Empty expand => 1),
698	]);	702	]);
699		703
700	$table->add ($_ + 1, $y, new CFClient::UI::Label	704	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
703	}	707	}
704	}	708	}
705	});	709	});
706	}	710	}
707		711
		712	sub metaserver_dialog {
		713	my $dialog = new CFClient::UI::FancyFrame
		714	title => "Server List",
		715	name => 'metaserver_dialog',
		716	x => 'center',
		717	y => 'center',
		718	child => (my $vbox = new CFClient::UI::VBox),
		719	on_visibility_change => sub {
		720	update_metaserver if $_[1];
		721	},
		722	;
		723
		724	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		725
		726	$dialog
		727	}
		728
708	sub server_setup {	729	sub server_setup {
709	my $dialog = new CFClient::UI::FancyFrame	730	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		731	x => "center",
		732	y => "center",
710	name => "server_setup",	733	name => "server_setup",
711	title => "Server Setup",	734	title => "Server Setup",
712	child => (my $vbox = new CFClient::UI::VBox);	735	child => (my $vbox = new CFClient::UI::VBox),
713		736	;
		737
714	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	738	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	739	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716		740
717	{	741	{
718	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	742	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719		743
720	$vbox->add (	744	$vbox->add (
721	my $HOST = new CFClient::UI::Entry	745	$HOST_ENTRY = new CFClient::UI::Entry
722	expand => 1,	746	expand => 1,
723	text => $CFG->{host},	747	text => $CFG->{host},
724	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	748	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725	on_changed => sub {	749	on_changed => sub {
726	my ($self, $value) = @_;	750	my ($self, $value) = @_;
…		…
728	}	752	}
729	);	753	);
730		754
731	$METASERVER = metaserver_dialog;	755	$METASERVER = metaserver_dialog;
732		756
733	$vbox->add (new CFClient::UI::Flopper	757	$vbox->add (new CFClient::UI::Button
734	expand => 1,	758	expand => 1,
735	text => "Server List",	759	text => "Server List",
736	other => $METASERVER,	760	other => $METASERVER,
737	tooltip => "Show a list of available crossfire servers",	761	tooltip => "Show a list of available crossfire servers",
738	on_open => sub {	762	on_activate => sub { $METASERVER->toggle_visibility },
739	update_metaserver $HOST;
740	}
741	);	763	);
742	}	764	}
743		765
744	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	766	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
745	$table->add (1, 4, new CFClient::UI::Entry	767	$table->add (1, 4, new CFClient::UI::Entry
…		…
762	}	784	}
763	);	785	);
764		786
765	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	787	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766	$table->add (1, 7, new CFClient::UI::Slider	788	$table->add (1, 7, new CFClient::UI::Slider
767	req_w => 100,	789	force_w => 100,
768	range => [$CFG->{mapsize}, 10, 100, 0, 1],	790	range => [$CFG->{mapsize}, 10, 100, 0, 1],
769	tooltip => "This is the size of the portion of the map update the server sends you. "	791	tooltip => "This is the size of the portion of the map update the server sends you. "
770	. "If you set this to a high value you will be able to see further, "	792	. "If you set this to a high value you will be able to see further, "
771	. "but you also increase bandwidth requirements and latency. "	793	. "but you also increase bandwidth requirements and latency. "
772	. "This option is only used once at log-in.",	794	. "This option is only used once at log-in.",
…		…
821	my $window = new CFClient::UI::FancyFrame	843	my $window = new CFClient::UI::FancyFrame
822	name => "message_window",	844	name => "message_window",
823	title => "Messages",	845	title => "Messages",
824	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
825	bg => [0, 0, 0, 0.75],	847	bg => [0, 0, 0, 0.75],
		848	x => "max",
		849	y => 0,
826	user_w => int $::WIDTH / 3,	850	force_w => $::WIDTH / 3,
827	user_h => int $::HEIGHT / 5,	851	force_h => $::HEIGHT / 5,
828	child => (my $vbox = new CFClient::UI::VBox);	852	child => (my $vbox = new CFClient::UI::VBox);
829		853
830	$vbox->add ($LOGVIEW);	854	$vbox->add ($LOGVIEW);
831		855
832	$vbox->add (my $input = new CFClient::UI::Entry	856	$vbox->add (my $input = new CFClient::UI::Entry
…		…
846	},	870	},
847	on_activate => sub {	871	on_activate => sub {
848	my ($input, $text) = @_;	872	my ($input, $text) = @_;
849	$input->set_text ('');	873	$input->set_text ('');
850		874
		875	if ($text =~ /^\/bind\s+(.*)$/) {
		876	CFClient::Binder::open_binding_dialog (sub {
		877	my ($mod, $sym) = @_;
		878	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		879	});
851	if ($text =~ /^\/(.*)/) {	880	} elsif ($text =~ /^\/(.*)/) {
852	$::CONN->user_send ($1);	881	$::CONN->user_send ($1);
853	} else {	882	} else {
854	my $say_cmd = $::CFG->{say_command} \|\| 'say';	883	my $say_cmd = $::CFG->{say_command} \|\| 'say';
855	$::CONN->user_send ("$say_cmd $text");	884	$::CONN->user_send ("$say_cmd $text");
856	}	885	}
…		…
864	},	893	},
865	);	894	);
866		895
867	$CONSOLE = {	896	$CONSOLE = {
868	window => $window,	897	window => $window,
869	input => $input	898	input => $input,
870	};	899	};
871		900
872	$window	901	$window
873	}	902	}
874		903
875	sub open_quit_dialog {	904	sub open_quit_dialog {
876	unless ($QUIT_DIALOG) {	905	unless ($QUIT_DIALOG) {
877
878	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	906	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		907	x => "center",
		908	y => "center",
		909	title => "Really Quit?",
		910	;
879		911
880	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881		913
882	$vb->add (new CFClient::UI::Label	914	$vb->add (new CFClient::UI::Label
883	text => "You should find a savebed and apply it first!",	915	text => "You should find a savebed and apply it first!",
…		…
893	$hb->add (new CFClient::UI::Button	925	$hb->add (new CFClient::UI::Button
894	text => "Quit anyway",	926	text => "Quit anyway",
895	expand => 1,	927	expand => 1,
896	on_activate => sub { exit },	928	on_activate => sub { exit },
897	);	929	);
		930	}
898		931
899	$QUIT_DIALOG->show_centered;	932	$QUIT_DIALOG->show;
900	} else {
901	$QUIT_DIALOG->show_centered;
902	}
903	}	933	}
904		934
905	sub make_inventory_window {	935	sub make_inventory_window {
906	my $invwin = new CFClient::UI::FancyFrame	936	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";	937	x => "center",
		938	y => "center",
		939	force_w => $WIDTH * 9/10,
		940	force_h => $HEIGHT * 9/10,
		941	title => "Inventory",
		942	;
908		943
909	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	944	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910		945
911	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	946	$hb->add (my $vb1 = new CFClient::UI::VBox);
912	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	947	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913	$lbl->set_text ("Player");
914	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	948	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915		949
916	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	950	$hb->add (my $vb2 = new CFClient::UI::VBox);
917		951
		952	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		953
		954	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		955
		956	# XXX: Call after $INVR = ... because set_opencont sets the items
		957	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		958
		959	$invwin
		960	}
		961
		962	sub make_spell_list {
		963	$SPELL_LIST = new CFClient::UI::SpellList
		964	force_w => $WIDTH * (9/10),
		965	force_h => $HEIGHT * (9/10);
		966	$SPELL_LIST
		967	}
		968
		969	sub make_binding_window {
		970	my $binding_list = new CFClient::UI::VBox;
		971
		972	my $refresh;
		973	$refresh = sub {
		974	$binding_list->clear ();
		975
		976	for my $mod (keys %{$::CFG->{bindings}}) {
		977	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		978	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		979	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		980
		981	my $lbl = join "; ", @$cmds;
		982	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		983	$binding_list->add (my $hb = new CFClient::UI::HBox);
		984	$hb->add (new CFClient::UI::Button
		985	text => "delete",
		986	tooltip => "Deletes the binding",
		987	on_activate => sub {
		988	$binding_list->remove ($hb);
		989	delete $::CFG->{bindings}->{$mod}->{$sym};
		990	});
		991
		992	$hb->add (new CFClient::UI::Button
		993	text => "edit",
		994	tooltip => "Edits the binding",
		995	on_activate => sub {
		996	$::BIND_EDITOR->set_binding (
		997	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		998	sub {
		999	my ($nmod, $nsym, $ncmds) = @_;
		1000	delete $::CFG->{bindings}->{$mod}->{$sym};
		1001	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1002	$refresh->();
		1003	$::BIND_WINDOW->show;
		1004	},
		1005	sub {
		1006	$::BIND_WINDOW->show;
		1007	});
		1008	$::BIND_EDITOR->show;
		1009	$::BIND_WINDOW->hide;
		1010	});
		1011
		1012	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1013	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1014	}
		1015	}
		1016	};
		1017
		1018	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1019	title => "Bindings",
		1020	x => "center",
		1021	y => "center",
		1022	def_w => int $WIDTH * 9/10,
		1023	def_h => int $HEIGHT * 9/10,
		1024	on_visibility_change => sub {
		1025	my ($self, $visible) = @_;
		1026	$refresh->() if $visible;
		1027	};
		1028
		1029	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1030	$vb->add ($binding_list);
918	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1031	$vb->add (my $hb = new CFClient::UI::HBox);
919	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
920	$hb2->add (new CFClient::UI::Button	1032	$hb->add (new CFClient::UI::Button
921	text => "Close",	1033	text => "record new",
922	tooltip => "Close the currently open container (if one is open)",	1034	expand => 1,
		1035	tooltip => "This button opens the binding editor with an empty binding.",
923	on_activate => sub {	1036	on_activate => sub {
924	$CONN->send ("apply $CONN->{open_container}")	1037	$::BIND_EDITOR->set_binding (undef, undef, [],
925	if $CONN->{open_container} != 0;	1038	sub {
		1039	my ($mod, $sym, $cmds) = @_;
		1040	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1041	$refresh->();
		1042	$::BIND_WINDOW->show;
		1043	},
		1044	sub {
		1045	$::BIND_WINDOW->show;
		1046	});
		1047	$::BIND_WINDOW->hide;
		1048	$::BIND_EDITOR->show;
926	},	1049	},
927	);	1050	);
		1051	$hb->add (new CFClient::UI::Button
		1052	text => "close",
		1053	tooltip => "Closes the binding window",
		1054	expand => 1,
		1055	on_activate => sub {
		1056	$::BIND_WINDOW->hide;
		1057	}
		1058	);
928		1059
929	$INVR_LBL->set_text ("Floor");	1060	$refresh->();
930	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1061	$BIND_WINDOW
931
932	$invwin
933	}	1062	}
934		1063
935	sub make_help_window {	1064	sub make_help_window {
936	my $win = new CFClient::UI::FancyFrame	1065	my $win = new CFClient::UI::FancyFrame
937	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1066	x => 'center',
		1067	y => 'center',
		1068	name => 'doc_browser',
		1069	force_w => int $WIDTH * 7/8,
		1070	force_h => int $HEIGHT * 7/8,
		1071	title => "Documentation";
938		1072
939	$win->add (my $vbox = new CFClient::UI::VBox);	1073	$win->add (my $vbox = new CFClient::UI::VBox);
940		1074
941	$vbox->add (my $buttons = new CFClient::UI::HBox);	1075	$vbox->add (my $buttons = new CFClient::UI::HBox);
942	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1076	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1003	if ($DEBUG_STATUS) {	1137	if ($DEBUG_STATUS) {
1004	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1138	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005	} else {	1139	} else {
1006	# create the widgets	1140	# create the widgets
1007		1141
1008	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1142	$DEBUG_STATUS = new CFClient::UI::Label
		1143	padding => 0,
		1144	z => 100,
		1145	force_x => "max",
		1146	force_y => 0;
1009	$DEBUG_STATUS->show;	1147	$DEBUG_STATUS->show;
1010		1148
		1149	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1150
1011	$STATUSBOX = new CFClient::UI::Statusbox;	1151	$STATUSBOX = new CFClient::UI::Statusbox;
1012	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1152	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1013		1153
1014	(new CFClient::UI::Frame	1154	(new CFClient::UI::Frame
1015	bg => [0, 0, 0, 0.4],	1155	bg => [0, 0, 0, 0.4],
1016	req_y => -1,	1156	force_x => 0,
		1157	force_y => "max",
1017	child => $STATUSBOX,	1158	child => $STATUSBOX,
1018	)->show;	1159	)->show;
1019		1160
1020	CFClient::UI::FancyFrame->new (	1161	CFClient::UI::FancyFrame->new (
		1162	x => 0,
		1163	y => $FONTSIZE + 8,
1021	border_bg => [1, 1, 1, 192/255],	1164	border_bg => [1, 1, 1, 192/255],
1022	bg => [1, 1, 1, 0],	1165	bg => [1, 1, 1, 0],
1023	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1166	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1167	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025	),	1168	),
…		…
1048	can_hover => 1,	1191	can_hover => 1,
1049	can_events => 1,	1192	can_events => 1,
1050	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1193	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051	;	1194	;
1052		1195
1053	$BUTTONBAR = new CFClient::UI::HBox;	1196	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1054		1197
1055	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1198	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1056	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1199	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1057	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1200	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1058	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1201	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1062	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	1205	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
1063		1206
1064	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1207	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1065	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1208	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1209	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1067	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1210	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1211	."You can also hit the Tab-key to show/hide the Inventory.");
1068		1212
1069	$BUTTONBAR->add (new CFClient::UI::Button	1213	$BUTTONBAR->add (new CFClient::UI::Button
1070	text => "Save Config",	1214	text => "Save Config",
1071	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1215	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072	on_activate => sub {	1216	on_activate => sub {
1073	$::CFG->{layout} = CFClient::UI::get_layout;	1217	$::CFG->{layout} = CFClient::UI::get_layout;
1074	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1218	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075	status "Configuration Saved";	1219	status "Configuration Saved";
1076	},	1220	},
1077	);	1221	);
1078		1222
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1223	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080	tooltip => "View Documentation");	1224	tooltip => "View Documentation");
		1225
		1226	$BUTTONBAR->add (new CFClient::UI::Flopper
		1227	text => "Bindings",
		1228	other => make_binding_window,
		1229	tooltip =>
		1230	"Lets you define, edit and delete bindings."
		1231	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1232	."with nothing set and the recording started. After doing the actions you "
		1233	."want to record press Insert and you will be asked to press a key-combo."
		1234	."After pressing the combo the binding will be saved automatically and the "
		1235	."binding editor closes");
		1236
		1237	$BUTTONBAR->add (new CFClient::UI::Flopper
		1238	text => "Spells",
		1239	other => make_spell_list,
		1240	tooltip => "The spell list");
1081		1241
1082	$BUTTONBAR->add (new CFClient::UI::Button	1242	$BUTTONBAR->add (new CFClient::UI::Button
1083	text => "Quit",	1243	text => "Quit",
1084	tooltip => "Terminates the program",	1244	tooltip => "Terminates the program",
1085	on_activate => sub {	1245	on_activate => sub {
…		…
1090	}	1250	}
1091	},	1251	},
1092	);	1252	);
1093		1253
1094	$BUTTONBAR->show;	1254	$BUTTONBAR->show;
		1255	$SERVER_SETUP->show;
1095		1256
1096	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1257	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098	# delay till geometry is constant
1099	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101	my $widget = $GAUGES->{win};
1102	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103	});
1104	force_refresh ();
1105	}	1258	}
1106	}	1259	}
1107		1260
1108	sub video_shutdown {	1261	sub video_shutdown {
1109	undef $SDL_ACTIVE;	1262	undef $SDL_ACTIVE;
…		…
1177		1330
1178	my %demo;#d#	1331	my %demo;#d#
1179		1332
1180	sub force_refresh {	1333	sub force_refresh {
1181	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1334	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1182	debug sprintf "%3.2f", $fps;	1335	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183		1336
1184	$CFClient::UI::ROOT->draw;	1337	$CFClient::UI::ROOT->draw;
1185		1338
1186	$WANT_REFRESH = 0;	1339	$WANT_REFRESH = 0;
1187	$CAN_REFRESH = 0;	1340	$CAN_REFRESH = 0;
…		…
1319	#############################################################################	1472	#############################################################################
1320		1473
1321	$SIG{INT} = $SIG{TERM} = sub { exit };	1474	$SIG{INT} = $SIG{TERM} = sub { exit };
1322		1475
1323	{	1476	{
1324	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1477	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1325		1478
1326	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1479	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327	CFClient::UI::set_layout ($::CFG->{layout});	1480	CFClient::UI::set_layout ($::CFG->{layout});
1328		1481
1329	my %DEF_CFG = (	1482	my %DEF_CFG = (
1330	sdl_mode => 0,	1483	sdl_mode => 0,
1331	width => 640,	1484	width => 640,
…		…
1409		1562
1410	END { CFClient::SDL_Quit }	1563	END { CFClient::SDL_Quit }
1411		1564
1412	=head1 NAME	1565	=head1 NAME
1413		1566
1414	pclient - A Crossfire+ and Crossfire game client	1567	cfplus - A Crossfire+ and Crossfire game client
1415		1568
1416	=head1 SYNOPSIS	1569	=head1 SYNOPSIS
1417		1570
1418	Just run it - no commandline arguments are supported.	1571	Just run it - no commandline arguments are supported.
1419		1572
1420	=head1 USAGE	1573	=head1 USAGE
1421		1574
1422	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1575	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423	fullscreen and interactively.	1576	fullscreen and interactively.
1424		1577
		1578	=head1 DEBUGGING
		1579
		1580
		1581	CFPLUS_DEBUG - environment variable
		1582
		1583	1 draw borders around widgets
		1584	2 add low-level widget info to tooltips
		1585	4 show fps
		1586	8 suppress tooltips
		1587
1425	=head1 AUTHOR	1588	=head1 AUTHOR
1426		1589
1427	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1590	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1428		1591
1429		1592

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs. Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC