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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.20 by root, Sun May 28 00:40:52 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;
		87	our $HOST_ENTRY;
		88
		89	our $SETUP_DIALOG;
		90	our $SETUP_NOTEBOOK;
		91	our $SETUP_SERVER;
		92	our $SETUP_KEYBOARD;
		93	our $SETUP_SPELLS;
86		94
87	our $FLOORBOX;	95	our $FLOORBOX;
88	our $GAUGES;	96	our $GAUGES;
89	our $STATWIDS;	97	our $STATWIDS;
90		98
…		…
97		105
98	our $ALT_ENTER_MESSAGE;	106	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	107	our $STATUSBOX;
100	our $DEBUG_STATUS;	108	our $DEBUG_STATUS;
101		109
		110	our $INV_WINDOW;
102	our $INV;	111	our $INV;
103	our $INVR;	112	our $INVR;
104	our $INVR_LBL;	113	our $INV_RIGHT_HB;
		114
		115	our $BIND_EDITOR;
		116
		117	our $PICKUP_CFG;
105		118
106	sub status {	119	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	120	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	121	}
109		122
110	sub debug {	123	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	124	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	125	}
115		126
116	sub start_game {	127	sub start_game {
117	status "logging in...";	128	status "logging in...";
		129
		130	$LOGIN_BUTTON->set_text ("Logout");
		131	$SETUP_DIALOG->hide;
118		132
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	133	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		134
121	my ($host, $port) = split /:/, $CFG->{host};	135	my ($host, $port) = split /:/, $CFG->{host};
122		136
…		…
151	};	165	};
152		166
153	if ($CONN) {	167	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	168	CFClient::lowdelay fileno $CONN->{fh};
155		169
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	170	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	171	} else {
163	status "unable to connect";	172	status "unable to connect";
164	stop_game();	173	stop_game();
165	}	174	}
166	}	175	}
167		176
168	sub stop_game {	177	sub stop_game {
		178	$LOGIN_BUTTON->set_text ("Login");
		179	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		180	$SETUP_DIALOG->show;
		181	$INV_WINDOW->hide;
		182
169	return unless $CONN;	183	return unless $CONN;
170		184
171	status "connection closed";	185	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	186
173	$CONN->destroy;	187	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	188	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	189	}
179		190
180	sub client_setup {	191	sub graphics_setup {
181	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,
183	req_y => $HEIGHT * (1/8),
184	name => "client_setup",
185	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	192	my $vbox = new CFClient::UI::VBox;
		193
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	194	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		195
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	196	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		198
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	199	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	200	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		201
195	$mode_slider->connect (changed => sub {	202	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	203	my ($self, $value) = @_;
197		204
…		…
314	on_activate => sub {	321	on_activate => sub {
315	video_shutdown ();	322	video_shutdown ();
316	video_init ();	323	video_init ();
317	}	324	}
318	);	325	);
		326
		327	$vbox
		328	}
		329
		330	sub audio_setup {
		331	my $vbox = new CFClient::UI::VBox;
		332
		333	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		334
		335	my $row = 0;
319		336
320	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	337	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321	$table->add (1, $row++, new CFClient::UI::CheckBox	338	$table->add (1, $row++, new CFClient::UI::CheckBox
322	state => $CFG->{audio_enable},	339	state => $CFG->{audio_enable},
323	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	340	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
…		…
354	audio_shutdown ();	371	audio_shutdown ();
355	audio_init ();	372	audio_init ();
356	}	373	}
357	);	374	);
358		375
359	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	376	$vbox
360	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361	text => $CFG->{say_command},
362	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
363	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365	on_changed => sub {
366	my ($self, $value) = @_;
367	$CFG->{say_command} = $value;
368	}
369	);
370
371	$dialog
372	}	377	}
373		378
374	sub set_stats_window_fontsize {	379	sub set_stats_window_fontsize {
375	for (values %{$STATWIDS}) {	380	for (values %{$STATWIDS}) {
376	$_->set_fontsize ($::CFG->{stat_fontsize});	381	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
385		390
386	sub make_gauge_window {	391	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	392	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		393
389	my $win = new CFClient::UI::Frame (	394	my $win = new CFClient::UI::Frame (
390	req_x => 0,	395	force_x => 0,
391	req_y => -1,	396	force_y => "max",
392	def_w => $WIDTH,	397	force_w => $WIDTH,
393	def_h => $gh,	398	force_h => $gh,
394	);	399	);
395		400
396	$win->add (my $hbox = new CFClient::UI::HBox	401	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	402	children => [
398	(new CFClient::UI::HBox expand => 1),	403	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	439	&set_gauge_window_fontsize;
435		440
436	$win	441	$win
437	}	442	}
438		443
		444
439	sub make_stats_window {	445	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	446	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	447	y => $HEIGHT * (2/8),
442	req_x => -1,	448	x => "max",
443	title => "Stats",	449	title => "Stats",
444	name => "stats_window";	450	name => "stats_window";
445		451
446	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	452	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	453	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448	can_hover => 1, can_events => 1,	454	can_hover => 1, can_events => 1,
449	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	455	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
548	update_stats_window ({});	554	update_stats_window ({});
549		555
550	$tgw	556	$tgw
551	}	557	}
552		558
553	sub formsep {	559	sub formsep($) {
554	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	560	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
555	}	561	}
556		562
557	sub update_stats_window {	563	sub update_stats_window {
558	my ($stats) = @_;	564	my ($stats) = @_;
559		565
…		…
621		627
622	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	628	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623	for keys %tbl;	629	for keys %tbl;
624	}	630	}
625		631
626	sub metaserver_dialog {
627	my $dialog = new CFClient::UI::FancyFrame
628	title => "Server List",
629	child => (my $vbox = new CFClient::UI::VBox);
630
631	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633	$dialog
634	}
635
636	my $METASERVER_ATIME;	632	my $METASERVER_ATIME;
637		633
638	sub update_metaserver {	634	sub update_metaserver {
639	my ($HOST) = @_;
640
641	return if $METASERVER_ATIME > time;	635	return if $METASERVER_ATIME > time;
642	$METASERVER_ATIME = time + 60;	636	$METASERVER_ATIME = time + 60;
643		637
644	my $table = $METASERVER->{table};	638	my $table = $METASERVER->{table};
645	$table->clear;	639	$table->clear;
…		…
697		691
698	$y++;	692	$y++;
699		693
700	$table->add (0, $y, new CFClient::UI::VBox children => [	694	$table->add (0, $y, new CFClient::UI::VBox children => [
701	(new CFClient::UI::Button text => "Use", on_activate => sub {	695	(new CFClient::UI::Button text => "Use", on_activate => sub {
702	$HOST->set_text ($CFG->{host} = $host);	696	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		697	$METASERVER->toggle_visibility;
703	}),	698	}),
704	(new CFClient::UI::Empty expand => 1),	699	(new CFClient::UI::Empty expand => 1),
705	]);	700	]);
706		701
707	$table->add ($_ + 1, $y, new CFClient::UI::Label	702	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
710	}	705	}
711	}	706	}
712	});	707	});
713	}	708	}
714		709
		710	sub metaserver_dialog {
		711	my $dialog = new CFClient::UI::FancyFrame
		712	title => "Server List",
		713	name => 'metaserver_dialog',
		714	x => 'center',
		715	y => 'center',
		716	child => (my $vbox = new CFClient::UI::VBox),
		717	on_visibility_change => sub {
		718	update_metaserver if $_[1];
		719	},
		720	;
		721
		722	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		723
		724	$dialog
		725	}
		726
715	sub server_setup {	727	sub server_setup {
716	my $dialog = new CFClient::UI::FancyFrame	728	my $vbox = new CFClient::UI::VBox;
717	x => $WIDTH * (1/3),
718	y => $HEIGHT * (1/8),
719	name => "server_setup",
720	title => "Server Setup",
721	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {
723	$_[0]->show_centered if $_[1]
724	};
725		729
726	$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]);
727	$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");
728		732
729	{	733	{
730	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
731		735
732	$vbox->add (	736	$vbox->add (
733	my $HOST = new CFClient::UI::Entry	737	$HOST_ENTRY = new CFClient::UI::Entry
734	expand => 1,	738	expand => 1,
735	text => $CFG->{host},	739	text => $CFG->{host},
736	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",
737	on_changed => sub {	741	on_changed => sub {
738	my ($self, $value) = @_;	742	my ($self, $value) = @_;
…		…
740	}	744	}
741	);	745	);
742		746
743	$METASERVER = metaserver_dialog;	747	$METASERVER = metaserver_dialog;
744		748
745	$vbox->add (new CFClient::UI::Flopper	749	$vbox->add (new CFClient::UI::Button
746	expand => 1,	750	expand => 1,
747	text => "Server List",	751	text => "Server List",
748	other => $METASERVER,	752	other => $METASERVER,
749	tooltip => "Show a list of available crossfire servers",	753	tooltip => "Show a list of available crossfire servers",
750	on_open => sub {	754	on_activate => sub { $METASERVER->toggle_visibility },
751	update_metaserver $HOST;
752	}
753	);	755	);
754	}	756	}
755		757
756	$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");
757	$table->add (1, 4, new CFClient::UI::Entry	759	$table->add (1, 4, new CFClient::UI::Entry
…		…
774	}	776	}
775	);	777	);
776		778
777	$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");
778	$table->add (1, 7, new CFClient::UI::Slider	780	$table->add (1, 7, new CFClient::UI::Slider
779	req_w => 100,	781	force_w => 100,
780	range => [$CFG->{mapsize}, 10, 100, 0, 1],	782	range => [$CFG->{mapsize}, 10, 100, 0, 1],
781	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. "
782	. "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, "
783	. "but you also increase bandwidth requirements and latency. "	785	. "but you also increase bandwidth requirements and latency. "
784	. "This option is only used once at log-in.",	786	. "This option is only used once at log-in.",
…		…
824	$CONN ? stop_game	826	$CONN ? stop_game
825	: start_game;	827	: start_game;
826	},	828	},
827	);	829	);
828		830
829	$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
830	}	844	}
831		845
832	sub message_window {	846	sub message_window {
833	my $window = new CFClient::UI::FancyFrame	847	my $window = new CFClient::UI::FancyFrame
834	name => "message_window",	848	name => "message_window",
835	title => "Messages",	849	title => "Messages",
836	border_bg => [1, 1, 1, 1],	850	border_bg => [1, 1, 1, 1],
837	bg => [0, 0, 0, 0.75],	851	bg => [0, 0, 0, 0.75],
838	req_x => -1,	852	x => "max",
839	req_y => 0,	853	y => 0,
840	def_w => int $::WIDTH / 3,	854	force_w => $::WIDTH / 3,
841	def_h => int $::HEIGHT / 5,	855	force_h => $::HEIGHT / 5,
842	child => (my $vbox = new CFClient::UI::VBox);	856	child => (my $vbox = new CFClient::UI::VBox);
843		857
844	$vbox->add ($LOGVIEW);	858	$vbox->add ($LOGVIEW);
845		859
846	$vbox->add (my $input = new CFClient::UI::Entry	860	$vbox->add (my $input = new CFClient::UI::Entry
…		…
878	},	892	},
879	);	893	);
880		894
881	$CONSOLE = {	895	$CONSOLE = {
882	window => $window,	896	window => $window,
883	input => $input	897	input => $input,
884	};	898	};
885		899
886	$window	900	$window
887	}	901	}
888		902
889	sub open_quit_dialog {	903	sub open_quit_dialog {
890	unless ($QUIT_DIALOG) {	904	unless ($QUIT_DIALOG) {
891
892	$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	;
893		910
894	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
895		912
896	$vb->add (new CFClient::UI::Label	913	$vb->add (new CFClient::UI::Label
897	text => "You should find a savebed and apply it first!",	914	text => "You should find a savebed and apply it first!",
…		…
907	$hb->add (new CFClient::UI::Button	924	$hb->add (new CFClient::UI::Button
908	text => "Quit anyway",	925	text => "Quit anyway",
909	expand => 1,	926	expand => 1,
910	on_activate => sub { exit },	927	on_activate => sub { exit },
911	);	928	);
		929	}
912		930
913	$QUIT_DIALOG->show_centered;	931	$QUIT_DIALOG->show;
914	} else {	932	}
915	$QUIT_DIALOG->show_centered;	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	)
916	}	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
917	}	1001	}
918		1002
919	sub make_inventory_window {	1003	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1005	x => "center",
		1006	y => "center",
921	def_w => $WIDTH * (7/8),	1007	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * (7/8),	1008	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	1009	title => "Inventory",
924	name => "inventory_window",	1010	;
925	on_visibility_change => sub {
926	$_[0]->show_centered if $_[1]
927	};
928		1011
929	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
930		1013
931	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1014	$hb->add (my $vb1 = new CFClient::UI::VBox);
932	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1015	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
933	$lbl->set_text ("Player");
934	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1016	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
935		1017
936	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	1018	$hb->add (my $vb2 = new CFClient::UI::VBox);
937		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);
938	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1087	$vb->add (my $hb = new CFClient::UI::HBox);
939	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);	1088
940	$hb2->add (new CFClient::UI::Button	1089	$hb->add (new CFClient::UI::Button
941	text => "Close",	1090	text => "record new",
942	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.",
943	on_activate => sub {	1093	on_activate => sub {
944	$CONN->send ("apply $CONN->{open_container}")	1094	$::BIND_EDITOR->set_binding (undef, undef, [],
945	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;
946	},	1109	},
947	);	1110	);
948		1111
949	$INVR_LBL->set_text ("Floor");	1112	$hb->add (new CFClient::UI::Button
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1113	text => "close",
		1114	tooltip => "Closes the binding window",
		1115	expand => 1,
		1116	on_activate => sub {
		1117	$SETUP_DIALOG->hide;
		1118	}
		1119	);
951		1120
952	$invwin	1121	$refresh->();
		1122
		1123	$vb
953	}	1124	}
954		1125
955	sub make_help_window {	1126	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1127	my $win = new CFClient::UI::FancyFrame
		1128	x => 'center',
		1129	y => 'center',
		1130	name => 'doc_browser',
957	def_w => int $WIDTH * 7/8,	1131	force_w => int $WIDTH * 7/8,
958	def_h => int $HEIGHT * 7/8,	1132	force_h => int $HEIGHT * 7/8,
959	title => "Documentation";	1133	title => "Documentation";
960		1134
961	$win->add (my $vbox = new CFClient::UI::VBox);	1135	$win->add (my $vbox = new CFClient::UI::VBox);
962		1136
963	$vbox->add (my $buttons = new CFClient::UI::HBox);	1137	$vbox->add (my $buttons = new CFClient::UI::HBox);
964	$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);
…		…
1025	if ($DEBUG_STATUS) {	1199	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1200	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1201	} else {
1028	# create the widgets	1202	# create the widgets
1029		1203
1030	$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;
1031	$DEBUG_STATUS->show;	1209	$DEBUG_STATUS->show;
1032		1210
		1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1212
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1213	$STATUSBOX = new CFClient::UI::Statusbox;
1034	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1215
1036	(new CFClient::UI::Frame	1216	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1217	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1218	force_x => 0,
		1219	force_y => "max",
1039	child => $STATUSBOX,	1220	child => $STATUSBOX,
1040	)->show;	1221	)->show;
1041		1222
1042	CFClient::UI::FancyFrame->new (	1223	CFClient::UI::FancyFrame->new (
		1224	title => "Map",
		1225	name => "mapmap",
		1226	x => 0,
		1227	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1228	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1229	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1230	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1231	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1232	),
…		…
1070	can_hover => 1,	1255	can_hover => 1,
1071	can_events => 1,	1256	can_events => 1,
1072	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.",
1073	;	1258	;
1074		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
1075	$BUTTONBAR = new CFClient::UI::HBox;	1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1292
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1078	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1295
1080	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1082	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083		1298
1084	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	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
1085		1300
1086	$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,
1087	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.");
1088	$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,
1089	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.");
1090		1306
1091	$BUTTONBAR->add (new CFClient::UI::Button	1307	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1308	text => "Save Config",
1093	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094	on_activate => sub {	1310	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1311	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1313	status "Configuration Saved";
1098	},	1314	},
1099	);	1315	);
1100		1316
1101	$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,
…		…
1112	}	1328	}
1113	},	1329	},
1114	);	1330	);
1115		1331
1116	$BUTTONBAR->show;	1332	$BUTTONBAR->show;
		1333	$SETUP_DIALOG->show;
		1334	}
1117		1335
1118	$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]);
1119
1120	# delay till geometry is constant
1121	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123	my $widget = $GAUGES->{win};
1124	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125	});
1126	force_refresh ();
1127	}
1128	}	1337	}
1129		1338
1130	sub video_shutdown {	1339	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1340	undef $SDL_ACTIVE;
1132	}	1341	}
…		…
1199		1408
1200	my %demo;#d#	1409	my %demo;#d#
1201		1410
1202	sub force_refresh {	1411	sub force_refresh {
1203	$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;
1204	debug sprintf "%3.2f", $fps;	1413	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1414
1206	$CFClient::UI::ROOT->draw;	1415	$CFClient::UI::ROOT->draw;
1207		1416
1208	$WANT_REFRESH = 0;	1417	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1418	$CAN_REFRESH = 0;
…		…
1264	};	1473	};
1265		1474
1266	CFClient::SDL_GL_SwapBuffers;	1475	CFClient::SDL_GL_SwapBuffers;
1267	}	1476	}
1268		1477
1269	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 {
1270	$NOW = time;	1479	$NOW = time;
1271		1480
1272	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1481	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1273	for CFClient::SDL_PollEvent;	1482	for CFClient::SDL_PollEvent;
1274		1483
…		…
1341	#############################################################################	1550	#############################################################################
1342		1551
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1552	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1553
1345	{	1554	{
1346	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	};
1347		1560
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1562	CFClient::UI::set_layout ($::CFG->{layout});
1350		1563
1351	my %DEF_CFG = (	1564	my %DEF_CFG = (
1352	sdl_mode => 0,	1565	sdl_mode => 0,
1353	width => 640,	1566	width => 640,
…		…
1431		1644
1432	END { CFClient::SDL_Quit }	1645	END { CFClient::SDL_Quit }
1433		1646
1434	=head1 NAME	1647	=head1 NAME
1435		1648
1436	pclient - A Crossfire+ and Crossfire game client	1649	cfplus - A Crossfire+ and Crossfire game client
1437		1650
1438	=head1 SYNOPSIS	1651	=head1 SYNOPSIS
1439		1652
1440	Just run it - no commandline arguments are supported.	1653	Just run it - no commandline arguments are supported.
1441		1654
1442	=head1 USAGE	1655	=head1 USAGE
1443		1656
1444	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
1445	fullscreen and interactively.	1658	fullscreen and interactively.
1446		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
1447	=head1 AUTHOR	1670	=head1 AUTHOR
1448		1671
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1672	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450		1673
1451		1674

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.20 by root, Sun May 28 00:40:52 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.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.53 by root, Mon Jun 5 00:56:44 2006 UTC