ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4
		5	# do splash-screen thingy on win32
		6	BEGIN {
		7	if (%PAR::LibCache && $^O eq "MSWin32") {
		8	while (my ($filename, $zip) = each %PAR::LibCache) {
		9	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		10	}
		11
		12	require Win32::GUI::SplashScreen;
		13
		14	Win32::GUI::SplashScreen::Show (
		15	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		16	);
		17
		18	$startup_done = sub {
		19	Win32::GUI::SplashScreen::Done (1);
		20	};
		21	}
		22	}
2		23
3	use strict;	24	use strict;
4	use utf8;	25	use utf8;
		26
		27	use Carp 'verbose';
5		28
6	# do things only needed for single-binary version (par)	29	# do things only needed for single-binary version (par)
7	BEGIN {	30	BEGIN {
8	if (%PAR::LibCache) {	31	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	32	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		33
11	while (my ($filename, $zip) = each %PAR::LibCache) {	34	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	35	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	36	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	38	unless -e "$ENV{PAR_TEMP}/$1";
16	}	39	}
17	}	40	}
18		41
…		…
32	use Crossfire;	55	use Crossfire;
33	use Crossfire::Protocol::Constants;	56	use Crossfire::Protocol::Constants;
34		57
35	use Compress::LZF;	58	use Compress::LZF;
36		59
37	use CFClient;	60	use CFPlus;
38	use CFClient::OpenGL ();	61	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	62	use CFPlus::Protocol;
40	use CFClient::UI;	63	use CFPlus::UI;
		64	use CFPlus::Pod;
		65	use CFPlus::BindingEditor;
41	use CFClient::MapWidget;	66	use CFPlus::MapWidget;
42		67
		68	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		69	$SIG{PIPE} = 'IGNORE';
		70
		71	$Event::Eval = 0;
43	$Event::DIED = sub {	72	$Event::DIED = sub {
44	# TODO: display dialog box or so	73	CFPlus::fatal Carp::longmess $_[1]
45	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];
47	};	74	};
48
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50
51	our $VERSION = '0.1';
52		75
53	my $MAX_FPS = 60;	76	my $MAX_FPS = 60;
54	my $MIN_FPS = 5; # unused as of yet	77	my $MIN_FPS = 5; # unused as of yet
55		78
56	our $META_SERVER = "crossfire.real-time.com:13326";	79	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
57		80
58	our $LAST_REFRESH;	81	our $LAST_REFRESH;
59	our $NOW;	82	our $NOW;
60		83
61	our $CFG;	84	our $CFG;
62	our $CONN;	85	our $CONN;
		86	our $PROFILE; # current profile
63	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	87	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
64		88
65	our $WANT_REFRESH;	89	our $WANT_REFRESH;
66	our $CAN_REFRESH;	90	our $CAN_REFRESH;
67		91
…		…
82	our $CONSOLE;	106	our $CONSOLE;
83	our $METASERVER;	107	our $METASERVER;
84	our $LOGIN_BUTTON;	108	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	109	our $QUIT_DIALOG;
86	our $HOST_ENTRY;	110	our $HOST_ENTRY;
		111	our $FULLSCREEN_ENABLE;
		112	our $PICKUP_ENABLE;
		113	our $SERVER_INFO;
87		114
88	our $SETUP_DIALOG;	115	our $SETUP_DIALOG;
89	our $SETUP_NOTEBOOK;	116	our $SETUP_NOTEBOOK;
90	our $SETUP_SERVER;	117	our $SETUP_SERVER;
91	our $SETUP_KEYBOARD;	118	our $SETUP_KEYBOARD;
92	our $SETUP_SPELLS;
93		119
		120	our $PL_NOTEBOOK;
		121	our $PL_WINDOW;
		122
		123	our $INVENTORY_PAGE;
		124	our $STATS_PAGE;
		125	our $SKILL_PAGE;
		126	our $SPELL_PAGE;
		127	our $SPELL_LIST;
		128
		129	our $HELP_WINDOW;
		130	our $MESSAGE_WINDOW;
94	our $FLOORBOX;	131	our $FLOORBOX;
95	our $GAUGES;	132	our $GAUGES;
96	our $STATWIDS;	133	our $STATWIDS;
97		134
98	our $SDL_ACTIVE;	135	our $SDL_ACTIVE;
…		…
104		141
105	our $ALT_ENTER_MESSAGE;	142	our $ALT_ENTER_MESSAGE;
106	our $STATUSBOX;	143	our $STATUSBOX;
107	our $DEBUG_STATUS;	144	our $DEBUG_STATUS;
108		145
109	our $INV_WINDOW;
110	our $INV;	146	our $INV;
111	our $INVR;	147	our $INVR;
112	our $INV_RIGHT_HB;	148	our $INV_RIGHT_HB;
113		149
114	our $BIND_EDITOR;	150	our $BIND_EDITOR;
		151	our $BIND_UPD_CB;
115		152
116	our $PICKUP_CFG;	153	our $PICKUP_CFG;
117		154
		155	our $IN_BUILD_MODE;
		156	our $BUILD_BUTTON;
		157
118	sub status {	158	sub status {
119	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120	}	160	}
121		161
122	sub debug {	162	sub debug {
123	$DEBUG_STATUS->set_text ($_[0]);	163	$DEBUG_STATUS->set_text ($_[0]);
124	}	164	}
125		165
		166	sub message {
		167	my ($para) = @_;
		168
		169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		170
		171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		172
		173	$LOGVIEW->add_paragraph ($para);
		174	$LOGVIEW->scroll_to_bottom;
		175	}
		176
		177	sub destroy_query_dialog {
		178	(delete $_[0]{query_dialog})->destroy
		179	if $_[0]{query_dialog};
		180	}
		181
		182	# server query dialog
		183	sub server_query {
		184	my ($conn, $flags, $prompt) = @_;
		185
		186	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
		187	x => "center",
		188	y => "center",
		189	title => "Server Query",
		190	child => my $vbox = new CFPlus::UI::VBox,
		191	;
		192
		193	my @dialog = my $label = new CFPlus::UI::Label
		194	max_w => $::WIDTH * 0.4,
		195	ellipsise => 0,
		196	text => $prompt;
		197
		198	if ($flags & CS_QUERY_YESNO) {
		199	push @dialog, my $hbox = new CFPlus::UI::HBox;
		200
		201	$hbox->add (new CFPlus::UI::Button
		202	text => "No",
		203	on_activate => sub {
		204	$conn->send ("reply n");
		205	$dialog->destroy;
		206	0
		207	}
		208	);
		209	$hbox->add (new CFPlus::UI::Button
		210	text => "Yes",
		211	on_activate => sub {
		212	$conn->send ("reply y");
		213	destroy_query_dialog $conn;
		214	0
		215	},
		216	);
		217
		218	$dialog->grab_focus;
		219
		220	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		221	$dialog->{tooltip} = "#charcreation_focus";
		222
		223	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
		224	$MESSAGE_WINDOW->show;
		225
		226	unshift @dialog, new CFPlus::UI::Label
		227	max_w => $::WIDTH * 0.4,
		228	ellipsise => 0,
		229	markup => "\nOr use your keyboard and the text entry below:\n";
		230
		231	unshift @dialog, my $table = new CFPlus::UI::Table;
		232
		233	$table->add (0, 0, new CFPlus::UI::Button
		234	text => "Next Race",
		235	on_activate => sub {
		236	$conn->send ("reply n");
		237	destroy_query_dialog $conn;
		238	0
		239	},
		240	);
		241	$table->add (2, 0, new CFPlus::UI::Button
		242	text => "Accept",
		243	on_activate => sub {
		244	$conn->send ("reply d");
		245	destroy_query_dialog $conn;
		246	0
		247	},
		248	);
		249
		250	unshift @dialog, new CFPlus::UI::Label
		251	max_w => $::WIDTH * 0.4,
		252	ellipsise => 0,
		253	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
		254	;
		255
		256	} elsif ($prompt =~ /roll new stats/) {
		257	if (my $stat = delete $conn->{stat_change_with}) {
		258	$conn->send ("reply $stat");
		259	destroy_query_dialog $conn;
		260	return;
		261	}
		262
		263	$STATS_PAGE->show;
		264	$MESSAGE_WINDOW->hide;
		265
		266	unshift @dialog, new CFPlus::UI::Label
		267	max_w => $::WIDTH * 0.4,
		268	ellipsise => 0,
		269	markup => "\nOr use your keyboard and the text entry below:\n";
		270
		271	unshift @dialog, my $table = new CFPlus::UI::Table;
		272
		273	# left: re-roll
		274	$table->add (0, 0, new CFPlus::UI::Button
		275	text => "Roll Again",
		276	on_activate => sub {
		277	$conn->send ("reply y");
		278	destroy_query_dialog $conn;
		279	0
		280	},
		281	);
		282
		283	# center: swap stats
		284	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		285	expand => 1,
		286	value => $_,
		287	options => [
		288	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		289	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		290	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		291	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		292	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		293	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		294	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		295	],
		296	), 1 .. 2;
		297
		298	$table->add (2, 0, new CFPlus::UI::Button
		299	text => "Swap Stats",
		300	on_activate => sub {
		301	$conn->{stat_change_with} = $sw2->{value};
		302	$conn->send ("reply $sw1->{value}");
		303	destroy_query_dialog $conn;
		304	0
		305	},
		306	);
		307	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
		308
		309	# right: accept
		310	$table->add (4, 0, new CFPlus::UI::Button
		311	text => "Accept",
		312	on_activate => sub {
		313	$conn->send ("reply n");
		314	$STATS_PAGE->hide;
		315	destroy_query_dialog $conn;
		316	0
		317	},
		318	);
		319
		320	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		321	for (
		322	[Str => CS_STAT_STR],
		323	[Dex => CS_STAT_DEX],
		324	[Con => CS_STAT_CON],
		325	[Int => CS_STAT_INT],
		326	[Wis => CS_STAT_WIS],
		327	[Pow => CS_STAT_POW],
		328	[Cha => CS_STAT_CHA],
		329	) {
		330	my ($name, $id) = @$_;
		331	$hbox->add (new CFPlus::UI::Label
		332	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		333	align => 0,
		334	expand => 1,
		335	can_events => 1,
		336	can_hover => 1,
		337	tooltip => "#stat_$name",
		338	);
		339	}
		340
		341	unshift @dialog, new CFPlus::UI::Label
		342	max_w => $::WIDTH * 0.4,
		343	ellipsise => 0,
		344	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
		345	;
		346	}
		347
		348	push @dialog, my $entry = new CFPlus::UI::Entry
		349	on_changed => sub {
		350	$conn->send ("reply $_[1]");
		351	destroy_query_dialog $conn;
		352	0
		353	},
		354	;
		355
		356	$entry->grab_focus;
		357
		358	} else {
		359	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		360
		361	push @dialog, my $entry = new CFPlus::UI::Entry
		362	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		363	on_activate => sub {
		364	$conn->send ("reply $_[1]");
		365	destroy_query_dialog $conn;
		366	0
		367	},
		368	;
		369
		370	$entry->grab_focus;
		371	}
		372
		373	$vbox->add (@dialog);
		374	$dialog->show;
		375	}
		376
126	sub start_game {	377	sub start_game {
127	status "logging in...";	378	status "logging in...";
128		379
129	$LOGIN_BUTTON->set_text ("Logout");	380	$LOGIN_BUTTON->set_text ("Logout");
130	$SETUP_DIALOG->hide;	381	$SETUP_DIALOG->hide;
131		382
		383	$PROFILE = $CFG->{profile}{default};
		384
132	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	385	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
133		386
134	my ($host, $port) = split /:/, $CFG->{host};	387	my ($host, $port) = split /:/, $PROFILE->{host};
135		388
136	$MAP = new CFClient::Map $mapsize, $mapsize;	389	$MAP = new CFPlus::Map;
137		390
138	$CONN = eval {	391	$CONN = eval {
139	new CFClient::Protocol	392	new CFPlus::Protocol
140	host => $host,	393	host => $host,
141	port => $port || 13327,	394	port => $port || 13327,
142	user => $CFG->{user},	395	user => $PROFILE->{user},
143	pass => $CFG->{password},	396	pass => $PROFILE->{password},
144	mapw => $mapsize,	397	mapw => $mapsize,
145	maph => $mapsize,	398	maph => $mapsize,
		399
		400	client => "cfplus $CFPlus::VERSION $] $^O",
146		401
147	map_widget => $MAPWIDGET,	402	map_widget => $MAPWIDGET,
148	logview => $LOGVIEW,	403	logview => $LOGVIEW,
149	statusbox => $STATUSBOX,	404	statusbox => $STATUSBOX,
150	map => $MAP,	405	map => $MAP,
151	mapmap => $MAPMAP,	406	mapmap => $MAPMAP,
		407	query => \&server_query,
152		408
153	sound_play => sub {	409	sound_play => sub {
154	my ($x, $y, $soundnum, $type) = @_;	410	my ($x, $y, $soundnum, $type) = @_;
155		411
156	$SDL_MIXER	412	$SDL_MIXER
…		…
162	$chunk->play;	418	$chunk->play;
163	},	419	},
164	};	420	};
165		421
166	if ($CONN) {	422	if ($CONN) {
167	CFClient::lowdelay fileno $CONN->{fh};	423	CFPlus::lowdelay fileno $CONN->{fh};
168		424
169	status "login successful";	425	status "login successful";
170	} else {	426	} else {
171	status "unable to connect";	427	status "unable to connect";
172	stop_game();	428	stop_game();
…		…
175		431
176	sub stop_game {	432	sub stop_game {
177	$LOGIN_BUTTON->set_text ("Login");	433	$LOGIN_BUTTON->set_text ("Login");
178	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	434	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	435	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	436	$PL_WINDOW->hide;
		437	$SPELL_LIST->clear_spells;
181		438
182	return unless $CONN;	439	return unless $CONN;
183		440
184	status "connection closed";	441	status "connection closed";
185		442
		443	destroy_query_dialog $CONN;
186	$CONN->destroy;	444	$CONN->destroy;
187	$CONN = 0; # false, does not autovivify	445	$CONN = 0; # false, does not autovivify
		446
		447	undef $MAP;
188	}	448	}
189		449
190	sub graphics_setup {	450	sub graphics_setup {
191	my $vbox = new CFClient::UI::VBox;	451	my $vbox = new CFPlus::UI::VBox;
192		452
193	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	453	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
194		454
195	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	455	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	456	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
197		457
198	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	458	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
199	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	459	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
200		460
201	$mode_slider->connect (changed => sub {	461	$mode_slider->connect (changed => sub {
202	my ($self, $value) = @_;	462	my ($self, $value) = @_;
203		463
204	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	464	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
206	});	466	});
207	$mode_slider->emit (changed => $mode_slider->{range}[0]);	467	$mode_slider->emit (changed => $mode_slider->{range}[0]);
208		468
209	my $row = 1;	469	my $row = 1;
210		470
211	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	471	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
212	$table->add (1, $row++, new CFClient::UI::CheckBox	472	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
213	state => $CFG->{fullscreen},	473	state => $CFG->{fullscreen},
214	tooltip => "Bring the client into fullscreen mode.",	474	tooltip => "Bring the client into fullscreen mode.",
215	on_changed => sub {	475	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216	my ($self, $value) = @_;
217	$CFG->{fullscreen} = $value;
218	}
219	);	476	);
220		477
221	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	478	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222	$table->add (1, $row++, new CFClient::UI::CheckBox	479	$table->add (1, $row++, new CFPlus::UI::CheckBox
223	state => $CFG->{fast},	480	state => $CFG->{fast},
224	tooltip => "Lower the visual quality considerably to speed up rendering.",	481	tooltip => "Lower the visual quality considerably to speed up rendering.",
225	on_changed => sub {	482	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226	my ($self, $value) = @_;
227	$CFG->{fast} = $value;
228	}
229	);	483	);
230		484
231	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	485	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
232	$table->add (1, $row++, new CFClient::UI::Slider	486	$table->add (1, $row++, new CFPlus::UI::Slider
233	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	487	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	488	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235	on_changed => sub {	489	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236	my ($self, $value) = @_;
237	$CFG->{map_scale} = 2 ** $value;
238	}
239	);	490	);
240		491
241	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	492	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
242	$table->add (1, $row++, new CFClient::UI::CheckBox	493	$table->add (1, $row++, new CFPlus::UI::CheckBox
243	state => $CFG->{fow_enable},	494	state => $CFG->{fow_enable},
244	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	495	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245	on_changed => sub {	496	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246	my ($self, $value) = @_;
247	$CFG->{fow_enable} = $value;
248	}
249	);	497	);
250		498
251	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	499	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252	$table->add (1, $row++, new CFClient::UI::Slider	500	$table->add (1, $row++, new CFPlus::UI::Slider
253	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	501	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
254	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	502	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
255	on_changed => sub {	503	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256	my ($self, $value) = @_;
257	$CFG->{fow_intensity} = $value;
258	}
259	);	504	);
260		505
261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	506	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262	$table->add (1, $row++, new CFClient::UI::CheckBox	507	$table->add (1, $row++, new CFPlus::UI::CheckBox
263	state => $CFG->{fow_smooth},	508	state => $CFG->{fow_smooth},
264	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	509	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265	on_changed => sub {	510	on_changed => sub {
266	my ($self, $value) = @_;	511	my ($self, $value) = @_;
267	$CFG->{fow_smooth} = $value;	512	$CFG->{fow_smooth} = $value;
268	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	513	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
		514	0
269	}	515	}
270	);	516	);
271		517
272	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	518	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273	$table->add (1, $row++, new CFClient::UI::Slider	519	$table->add (1, $row++, new CFPlus::UI::Slider
274	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	520	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
275	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	521	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
276	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	522	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277	);	523	);
278		524
279	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFPlus::UI::Slider
281	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	527	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
282	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	528	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
283	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	529	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
284	);	530	);
285		531
286	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
287
288	$table->add (1, $row++, new CFClient::UI::Slider
289	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
290	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
291	on_changed => sub {
292	$CFG->{stat_fontsize} = $_[1];
293	&set_stats_window_fontsize;
294	}
295	);
296
297	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	532	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298	$table->add (1, $row++, new CFClient::UI::Slider	533	$table->add (1, $row++, new CFPlus::UI::Slider
299	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	534	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
300	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	535	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301	on_changed => sub {	536	on_changed => sub {
302	$CFG->{gauge_fontsize} = $_[1];	537	$CFG->{gauge_fontsize} = $_[1];
303	&set_gauge_window_fontsize;	538	&set_gauge_window_fontsize;
		539	0
304	}	540	}
305	);	541	);
306		542
307	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	543	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
308	$table->add (1, $row++, new CFClient::UI::Slider	544	$table->add (1, $row++, new CFPlus::UI::Slider
309	range => [$CFG->{gauge_size}, 0.2, 0.8],	545	range => [$CFG->{gauge_size}, 0.2, 0.8],
310	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	546	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311	on_changed => sub {	547	on_changed => sub {
312	$CFG->{gauge_size} = $_[1];	548	$CFG->{gauge_size} = $_[1];
313	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	549	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		550	0
314	}	551	}
315	);	552	);
316		553
317	$table->add (1, $row++, new CFClient::UI::Button	554	$table->add (1, $row++, new CFPlus::UI::Button
318	expand => 1, align => 0, text => "Apply",	555	expand => 1, align => 0, text => "Apply",
319	tooltip => "Apply the video settings",	556	tooltip => "Apply the video settings",
320	on_activate => sub {	557	on_activate => sub {
321	video_shutdown ();	558	video_shutdown ();
322	video_init ();	559	video_init ();
		560	0
323	}	561	}
324	);	562	);
325		563
326	$vbox	564	$vbox
327	}	565	}
328		566
329	sub audio_setup {	567	sub audio_setup {
330	my $vbox = new CFClient::UI::VBox;	568	my $vbox = new CFPlus::UI::VBox;
331		569
332	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	570	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
333		571
334	my $row = 0;	572	my $row = 0;
335		573
336	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	574	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
337	$table->add (1, $row++, new CFClient::UI::CheckBox	575	$table->add (1, $row++, new CFPlus::UI::CheckBox
338	state => $CFG->{audio_enable},	576	state => $CFG->{audio_enable},
339	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	577	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	on_changed => sub {	578	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
341	$CFG->{audio_enable} = $_[1];
342	}
343	);	579	);
344	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	580	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
345	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	581	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
346	# $CFG->{effects_volume} = $_[1];	582	# $CFG->{effects_volume} = $_[1];
347	# });	583	# });
348	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	584	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
349	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	585	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
350	$hbox->add (new CFClient::UI::CheckBox	586	$hbox->add (new CFPlus::UI::CheckBox
351	expand => 1, state => $CFG->{bgm_enable},	587	expand => 1, state => $CFG->{bgm_enable},
352	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	588	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
353	on_changed => sub {	589	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
354	$CFG->{bgm_enable} = $_[1];
355	}
356	);	590	);
357	$hbox->add (new CFClient::UI::Slider	591	$hbox->add (new CFPlus::UI::Slider
358	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	592	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
359	tooltip => "The volume of the background music. Changes are instant.",	593	tooltip => "The volume of the background music. Changes are instant.",
360	on_changed => sub {	594	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
361	$CFG->{bgm_volume} = $_[1];
362	CFClient::MixMusic::volume $_[1] * 128;
363	}
364	);	595	);
365		596
366	$table->add (1, $row++, new CFClient::UI::Button	597	$table->add (1, $row++, new CFPlus::UI::Button
367	expand => 1, align => 0, text => "Apply",	598	expand => 1, align => 0, text => "Apply",
368	tooltip => "Apply the audio settings",	599	tooltip => "Apply the audio settings",
369	on_activate => sub {	600	on_activate => sub {
370	audio_shutdown ();	601	audio_shutdown ();
371	audio_init ();	602	audio_init ();
		603	0
372	}	604	}
373	);	605	);
374		606
375	$vbox	607	$vbox
376	}
377
378	sub set_stats_window_fontsize {
379	for (values %{$STATWIDS}) {
380	$_->set_fontsize ($::CFG->{stat_fontsize});
381	}
382	}	608	}
383		609
384	sub set_gauge_window_fontsize {	610	sub set_gauge_window_fontsize {
385	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	611	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386	$_->set_fontsize ($::CFG->{gauge_fontsize});	612	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
388	}	614	}
389		615
390	sub make_gauge_window {	616	sub make_gauge_window {
391	my $gh = int $HEIGHT * $CFG->{gauge_size};	617	my $gh = int $HEIGHT * $CFG->{gauge_size};
392		618
393	my $win = new CFClient::UI::Frame (	619	my $win = new CFPlus::UI::Frame (
394	force_x => 0,	620	force_x => 0,
395	force_y => "max",	621	force_y => "max",
396	force_w => $WIDTH,	622	force_w => $WIDTH,
397	force_h => $gh,	623	force_h => $gh,
398	);	624	);
399		625
400	$win->add (my $hbox = new CFClient::UI::HBox	626	$win->add (my $hbox = new CFPlus::UI::HBox
401	children => [	627	children => [
402	(new CFClient::UI::HBox expand => 1),	628	(new CFPlus::UI::HBox expand => 1),
403	(new CFClient::UI::VBox children => [	629	(new CFPlus::UI::VBox children => [
404	(new CFClient::UI::Empty expand => 1),	630	(new CFPlus::UI::Empty expand => 1),
405	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	631	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
406	]),	632	]),
407	(my $vbox = new CFClient::UI::VBox),	633	(my $vbox = new CFPlus::UI::VBox),
408	],	634	],
409	);	635	);
410		636
411	$vbox->add (new CFClient::UI::HBox	637	$vbox->add (new CFPlus::UI::HBox
412	expand => 1,	638	expand => 1,
413	children => [	639	children => [
414	(new CFClient::UI::Empty expand => 1),	640	(new CFPlus::UI::Empty expand => 1),
415	(my $hb = new CFClient::UI::HBox),	641	(my $hb = new CFPlus::UI::HBox),
416	],	642	],
417	);	643	);
418		644
419	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	645	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
420	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
421	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	646	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
422	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
423	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	647	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
424	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
425	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	648	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
426	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
427		649
428	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	650	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
429	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
430	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	651	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
431	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
432		652
433	$GAUGES = {	653	$GAUGES = {
434	exp => $exp, win => $win, range => $rng,	654	exp => $exp, win => $win, range => $rng,
435	food => $fg, mana => $mg, hp => $hg, grace => $gg	655	food => $fg, mana => $mg, hp => $hg, grace => $gg
436	};	656	};
…		…
438	&set_gauge_window_fontsize;	658	&set_gauge_window_fontsize;
439		659
440	$win	660	$win
441	}	661	}
442		662
		663	sub debug_setup {
		664	my $table = new CFPlus::UI::Table;
443		665
		666	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
		667	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		668	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
		669	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		670	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
		671	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		672	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
		673	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		674	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
		675
		676	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		677
		678	for my $x (0..2) {
		679	for my $y (0 .. 2) {
		680	$table->add ($x + 3, $y,
		681	new CFPlus::UI::Entry
		682	text => $default_smooth[$x * 3 + $y],
		683	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		684	);
		685	}
		686	}
		687
		688	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
		689
		690	$table
		691	}
		692
444	sub make_stats_window {	693	sub stats_window {
445	my $tgw = new CFClient::UI::FancyFrame	694	my $r = new CFPlus::UI::ScrolledWindow (
446	y => $HEIGHT * (2/8),	695	expand => 1,
447	x => "max",	696	scroll_y => 1
448	title => "Stats",	697	);
449	name => "stats_window";	698	$r->add (my $vb = new CFPlus::UI::VBox);
450		699
451	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	700	$vb->add (new CFPlus::UI::FancyFrame
		701	label => "Player",
		702	child => (my $pi = new CFPlus::UI::VBox),
		703	);
		704
452	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	705	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453	can_hover => 1, can_events => 1,	706	can_hover => 1, can_events => 1,
454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	707	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
455	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	708	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456	can_hover => 1, can_events => 1,	709	can_hover => 1, can_events => 1,
457	tooltip => "The map you are currently on (if supported by the server).");	710	tooltip => "The map you are currently on (if supported by the server).");
458		711
459	$vb->add (my $hb0 = new CFClient::UI::HBox);	712	$pi->add (my $hb0 = new CFPlus::UI::HBox);
460	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	713	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
461	can_hover => 1, can_events => 1,	714	can_hover => 1, can_events => 1,
462	tooltip => "The weight of the player including all inventory items.");	715	tooltip => "The weight of the player including all inventory items.");
463	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	716	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
464	can_hover => 1, can_events => 1,	717	can_hover => 1, can_events => 1,
465	tooltip => "The weight limit: you cannot carry more than this.");	718	tooltip => "The weight limit: you cannot carry more than this.");
466		719
467		720	$vb->add (new CFPlus::UI::FancyFrame
		721	label => "Primary/Secondary Statistics",
468	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	722	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		723	);
469	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	724	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470		725
471	my $color2 = [1, 1, 0];	726	my $color2 = [1, 1, 0];
472		727
473	for (	728	for (
474	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	729	[0, 0, st_str => "Str", 30],
475	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	730	[0, 1, st_dex => "Dex", 30],
476	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	731	[0, 2, st_con => "Con", 30],
477	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	732	[0, 3, st_int => "Int", 30],
478	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	733	[0, 4, st_wis => "Wis", 30],
479	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	734	[0, 5, st_pow => "Pow", 30],
480	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	735	[0, 6, st_cha => "Cha", 30],
481		736
482	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	737	[2, 0, st_wc => "Wc", -120],
483	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	738	[2, 1, st_ac => "Ac", -120],
484	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	739	[2, 2, st_dam => "Dam", 120],
485	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],	740	[2, 3, st_arm => "Arm", 120],
486	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	741	[2, 4, st_spd => "Spd", 10.54],
487	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	742	[2, 5, st_wspd => "WSp", 10.54],
488	) {	743	) {
489	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	744	my ($col, $row, $id, $label, $template) = @$_;
490		745
491	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	746	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	747	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		748	align => +1, template => $template, tooltip => "#stat_$label");
493	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	749	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
494	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	750	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		751	align => -1, text => $label, tooltip => "#stat_$label");
495	}	752	}
496		753
		754	$vb->add (new CFPlus::UI::FancyFrame
		755	label => "Resistancies",
497	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	756	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		757	);
498		758
499	my $row = 0;	759	my $row = 0;
500	my $col = 0;	760	my $col = 0;
501		761
502	my %resist_names = (	762	my %resist_names = (
		763	slow => ["Slow",
503	slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",	764	"<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
		765	holyw => ["Holy Word",
504	holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",	766	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		767	conf => ["Confusion",
505	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	768	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		769	fire => ["Fire",
506	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	770	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		771	depl => ["Depletion",
507	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	772	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		773	magic => ["Magic",
508	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	774	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		775	drain => ["Draining",
509	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	776	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		777	acid => ["Acid",
510	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	778	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		779	pois => ["Poison",
511	pois => "<b>Poison</b> (resistance to getting poisoned)",	780	"<b>Poison</b> (resistance to getting poisoned)"],
		781	para => ["Paralysation",
512	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	782	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		783	deat => ["Death",
513	deat => "<b>Death</b> (resistance against death spells)",	784	"<b>Death</b> (resistance against death spells)"],
514	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	785	phys => ["Physical",
		786	"<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
		787	blind => ["Blind",
515	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	788	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		789	fear => ["Fear",
516	fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",	790	"<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
		791	tund => ["Turn undead",
517	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	792	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		793	elec => ["Electricity",
518	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	794	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		795	cold => ["Cold",
519	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	796	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		797	ghit => ["Ghost hit",
520	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	798	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
521	);	799	);
522	for (qw/slow holyw conf fire depl magic	800	for (qw/slow holyw conf fire depl magic
523	drain acid pois para deat phys	801	drain acid pois para deat phys
524	blind fear tund elec cold ghit/)	802	blind fear tund elec cold ghit/)
525	{	803	{
526	$tbl2->add ($col, $row,	804	$tbl2->add ($col, $row,
527	$STATWIDS->{"res_$_"} =	805	$STATWIDS->{"res_$_"} =
528	new CFClient::UI::Label	806	new CFPlus::UI::Label
529	font => $FONT_FIXED,	807	font => $FONT_FIXED,
530	template => "-100%",	808	template => "-100%",
531	align => +1,	809	align => +1,
532	valign => 0,	810	valign => 0,
533	can_events => 1,	811	can_events => 1,
534	can_hover => 1,	812	can_hover => 1,
535	tooltip => $resist_names{$_},	813	tooltip => $resist_names{$_}->[1],
536	);	814	);
537	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	815	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
538	font => $FONT_FIXED,	816	font => $FONT_FIXED,
539	can_hover => 1,	817	can_hover => 1,
540	can_events => 1,	818	can_events => 1,
541	image => "ui/resist/resist_$_.png",	819	path => "ui/resist/resist_$_.png",
542	tooltip => $resist_names{$_},	820	tooltip => $resist_names{$_}->[1],
		821	);
		822	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
		823	text => $resist_names{$_}->[0],
		824	font => $FONT_FIXED,
		825	can_hover => 1,
		826	can_events => 1,
		827	tooltip => $resist_names{$_}->[1],
543	);	828	);
544		829
545	$row++;	830	$row++;
546	if ($row % 6 == 0) {	831	if ($row % 6 == 0) {
547	$col += 2;	832	$col += 3;
548	$row = 0;	833	$row = 0;
549	}	834	}
550	}	835	}
551		836
552	&set_stats_window_fontsize;
553	update_stats_window ({});	837	#update_stats_window ({});
554		838
		839	$r
		840	}
		841
		842	sub skill_window {
		843	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		844	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
555	$tgw	845	$sw
556	}	846	}
557		847
558	sub formsep($) {	848	sub formsep($) {
559	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	849	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560	}	850	}
561		851
562	sub update_stats_window {
563	my ($stats) = @_;
564
565	# I love text protocols...
566
567	my $hp = $stats->{+CS_STAT_HP} * 1;
568	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569	my $sp = $stats->{+CS_STAT_SP} * 1;
570	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571	my $fo = $stats->{+CS_STAT_FOOD} * 1;
572	my $fo_m = 999;
573	my $gr = $stats->{+CS_STAT_GRACE} * 1;
574	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576	$GAUGES->{hp} ->set_value ($hp, $hp_m);
577	$GAUGES->{mana} ->set_value ($sp, $sp_m);
578	$GAUGES->{food} ->set_value ($fo, $fo_m);
579	$GAUGES->{grace} ->set_value ($gr, $gr_m);
580	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582	my $rng = $stats->{+CS_STAT_RANGE};
583	$rng =~ s/^Range: //; # thank you so much dear server
584	$GAUGES->{range} ->set_text ("Rng: " . $rng);
585	my $title = $stats->{+CS_STAT_TITLE};
586	$title =~ s/^Player: //;
587	$STATWIDS->{title} ->set_text ("Title: " . $title);
588
589	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605	# TODO: replace by CS_STAT_RES_xxx constants
606	my %tbl = (
607	phys => 100,
608	magic => 101,
609	fire => 102,
610	elec => 103,
611	cold => 104,
612	conf => 105,
613	acid => 106,
614	drain => 107,
615	ghit => 108,
616	pois => 109,
617	slow => 110,
618	para => 111,
619	tund => 112,
620	fear => 113,
621	depl => 113,
622	deat => 115,
623	holyw => 116,
624	blind => 117,
625	);
626
627	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628	for keys %tbl;
629	}
630
631	my $METASERVER_ATIME;	852	my $METASERVER_ATIME;
632		853
633	sub update_metaserver {	854	sub update_metaserver {
		855	my ($metaserver_dialog) = @_;
		856
		857	$METASERVER = $metaserver_dialog
		858	if defined $metaserver_dialog;
		859
634	return if $METASERVER_ATIME > time;	860	return if $METASERVER_ATIME > time;
635	$METASERVER_ATIME = time + 60;	861	$METASERVER_ATIME = time + 60;
636		862
637	my $table = $METASERVER->{table};	863	my $table = $METASERVER->{table};
638	$table->clear;	864	$table->clear;
639	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	865	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
640		866
641	my $buf;	867	my $ok = 0;
642		868
643	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	869	CFPlus::background {
		870	my $ua = CFPlus::lwp_useragent;
644		871
645	unless ($fh) {	872	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
646	$label->set_text ("unable to contact metaserver: $!");	873	} sub {
647	return;	874	my ($msg) = @_;
648	}	875	if ($msg) {
649
650	Event->io (fd => $fh, poll => 'r', cb => sub {
651	my $res = sysread $fh, $buf, 8192, length $buf;
652
653	if (!defined $res) {
654	$_[0]->w->cancel;
655	$label->set_text ("error while retrieving server list: $!");
656	} elsif ($res == 0) {
657	$_[0]->w->cancel;
658	status "server list retrieved";
659
660	utf8::decode $buf if utf8::valid $buf;
661
662	$table->clear;	876	$table->clear;
663		877
		878	my @tip = (
		879	"The current number of users logged in on the server.",
		880	"The hostname of the server.",
		881	"The time this server has been running without being restarted.",
		882	"The server software version - a '+' indicates a Crossfire+ server.",
		883	"Short information about this server provided by its admins.",
		884	);
664	my @col = qw(Use #Users Host Uptime Version Description);	885	my @col = qw(#Users Host Uptime Version Description);
665	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	886	$table->add ($_, 0, new CFPlus::UI::Label
		887	can_hover => 1, can_events => 1,
		888	align => 0, fg => [1, 1, 0],
		889	text => $col[$_], tooltip => $tip[$_])
666	for 0 .. $#col;	890	for 0 .. $#col;
667		891
668	my @align = qw(1 0 1 1 -1);	892	my @align = qw(1 0 1 1 -1);
669		893
670	my $y = 0;	894	my $y = 0;
671	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	895	for my $m (
		896	sort {
		897	$b->{version} <=> $a->{version}
		898	or $b->{users} <=> $a->{users}
		899	}
		900	@{ $msg->{servers} }
		901	) {
672	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	902	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		903	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
673		904
674	for ($desc) {	905	for ($desc) {
675	s/<br>/\n/gi;	906	s/<br>/\n/gi;
676	s/<li>/\n· /gi;	907	s/<li>/\n· /gi;
677	s/<.*?>//sgi;	908	s/<.*?>//sgi;
678	s/&/&amp;/g;	909	s/&amp;/&/g;
679	s/</&lt;/g;	910	s/&lt;/</g;
680	s/>/&gt;/g;	911	s/&gt;/>/g;
681	}	912	}
682		913
683	$uptime = sprintf "%dd %02d:%02d:%02d",	914	$uptime = sprintf "%dd %02d:%02d:%02d",
684	(int $m->[8] / 86400),	915	(int $uptime / 86400),
685	(int $m->[8] / 3600) % 24,	916	(int $uptime / 3600) % 24,
686	(int $m->[8] / 60) % 60,	917	(int $uptime / 60) % 60,
687	$m->[8] % 60;	918	$uptime % 60;
688		919
689	$m = [$users, $host, $uptime, $version, $desc];	920	$m = [$users, $host, $uptime, $version, $desc];
690		921
691	$y++;	922	$y++;
692		923
693	$table->add (0, $y, new CFClient::UI::VBox children => [	924	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
694	(new CFClient::UI::Button text => "Use", on_activate => sub {	925	(new CFPlus::UI::Button
		926	text => "Use",
		927	tooltip => "Put this server into the <b>Host:Port</b> field",
		928	on_activate => sub {
695	$HOST_ENTRY->set_text ($CFG->{host} = $host);	929	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
696	$METASERVER->toggle_visibility;	930	$METASERVER->hide;
		931	0
		932	},
697	}),	933	),
698	(new CFClient::UI::Empty expand => 1),	934	(new CFPlus::UI::Empty expand => 1),
699	]);	935	]);
700		936
701	$table->add ($_ + 1, $y, new CFClient::UI::Label	937	$table->add ($_, $y, new CFPlus::UI::Label
702	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	938	max_w => $::WIDTH * 0.4,
		939	ellipsise => 0,
		940	align => $align[$_],
		941	text => $m->[$_],
		942	tooltip => $tip[$_],
		943	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
		944	can_hover => 1,
		945	can_events => 1,
		946	fontsize => 0.8)
703	for 0 .. $#$m;	947	for 0 .. $#$m;
704	}	948	}
		949	} else {
		950	$ok or $label->set_text ("error while contacting metaserver");
705	}	951	}
706	});	952	};
		953
707	}	954	}
708		955
709	sub metaserver_dialog {	956	sub metaserver_dialog {
710	my $dialog = new CFClient::UI::FancyFrame	957	my $vbox = new CFPlus::UI::VBox;
		958	my $table = new CFPlus::UI::Table;
		959	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		960
		961	my $dialog = new CFPlus::UI::Toplevel
711	title => "Server List",	962	title => "Server List",
712	name => 'metaserver_dialog',	963	name => 'metaserver_dialog',
713	x => 'center',	964	x => 'center',
714	y => 'center',	965	y => 'center',
715	child => (my $vbox = new CFClient::UI::VBox),	966	z => 3,
		967	force_w => $::WIDTH * 0.9,
		968	force_h => $::HEIGHT * 0.7,
		969	child => $vbox,
		970	has_close_button => 1,
		971	table => $table,
716	on_visibility_change => sub {	972	on_visibility_change => sub {
717	update_metaserver if $_[1];	973	update_metaserver ($_[0]) if $_[1];
		974	0
718	},	975	},
719	;	976	;
720		977
721	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
722
723	$dialog	978	$dialog
724	}	979	}
725		980
726	sub server_setup {	981	sub server_setup {
727	my $vbox = new CFClient::UI::VBox;	982	my $vbox = new CFPlus::UI::VBox;
728		983
		984	$vbox->add (new CFPlus::UI::FancyFrame
		985	label => "Connection Settings",
729	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	986	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		987	);
730	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	988	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
731		989
732	{	990	{
733	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	991	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
734		992
735	$vbox->add (	993	$vbox->add (
736	$HOST_ENTRY = new CFClient::UI::Entry	994	$HOST_ENTRY = new CFPlus::UI::Entry
737	expand => 1,	995	expand => 1,
738	text => $CFG->{host},	996	text => $CFG->{profile}{default}{host},
739	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	997	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740	on_changed => sub {	998	on_changed => sub {
741	my ($self, $value) = @_;	999	my ($self, $value) = @_;
742	$CFG->{host} = $value;	1000	$CFG->{profile}{default}{host} = $value;
		1001	0
743	}	1002	}
744	);	1003	);
745		1004
746	$METASERVER = metaserver_dialog;
747
748	$vbox->add (new CFClient::UI::Button	1005	$vbox->add (new CFPlus::UI::Button
749	expand => 1,	1006	expand => 1,
750	text => "Server List",	1007	text => "Server List",
751	other => $METASERVER,	1008	other => $METASERVER,
752	tooltip => "Show a list of available crossfire servers",	1009	tooltip => "Show a list of available crossfire servers",
753	on_activate => sub { $METASERVER->toggle_visibility },	1010	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		1011	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
754	);	1012	);
755	}	1013	}
756		1014
757	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1015	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
758	$table->add (1, 4, new CFClient::UI::Entry	1016	$table->add (1, 4, new CFPlus::UI::Entry
759	text => $CFG->{user},	1017	text => $CFG->{profile}{default}{user},
760	tooltip => "The name of your character on the server",	1018	tooltip => "The name of your character on the server",
761	on_changed => sub {	1019	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
762	my ($self, $value) = @_;
763	$CFG->{user} = $value;
764	}
765	);	1020	);
766		1021
767	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1022	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
768	$table->add (1, 5, new CFClient::UI::Entry	1023	$table->add (1, 5, new CFPlus::UI::Entry
769	text => $CFG->{password},	1024	text => $CFG->{profile}{default}{password},
770	hidden => 1,	1025	hidden => 1,
771	tooltip => "The password for your character",	1026	tooltip => "The password for your character",
772	on_changed => sub {	1027	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
773	my ($self, $value) = @_;
774	$CFG->{password} = $value;
775	}
776	);	1028	);
777		1029
778	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1030	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
779	$table->add (1, 7, new CFClient::UI::Slider	1031	$table->add (1, 7, new CFPlus::UI::Slider
780	force_w => 100,	1032	force_w => 100,
781	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1033	range => [$CFG->{mapsize}, 10, 100, 0, 1],
782	tooltip => "This is the size of the portion of the map update the server sends you. "	1034	tooltip => "This is the size of the portion of the map update the server sends you. "
783	. "If you set this to a high value you will be able to see further, "	1035	. "If you set this to a high value you will be able to see further, "
784	. "but you also increase bandwidth requirements and latency. "	1036	. "but you also increase bandwidth requirements and latency. "
785	. "This option is only used once at log-in.",	1037	. "This option is only used once at log-in.",
786	on_changed => sub {	1038	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
787	my ($self, $value) = @_;
788
789	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
790	},
791	);	1039	);
792		1040
793	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1041	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
794	$table->add (1, 8, new CFClient::UI::CheckBox	1042	$table->add (1, 8, new CFPlus::UI::CheckBox
795	state => $CFG->{face_prefetch},	1043	state => $CFG->{face_prefetch},
796	tooltip => "<b>Background Image Prefetch</b>\n\n"	1044	tooltip => "<b>Background Image Prefetch</b>\n\n"
797	. "If enabled, the client automatically pre-fetches images from the server. "	1045	. "If enabled, the client automatically pre-fetches images from the server. "
798	. "This might increase or create lag, but increases the chances "	1046	. "This might increase or create lag, but increases the chances "
799	. "of faces being ready for display when you encounter them. "	1047	. "of faces being ready for display when you encounter them. "
800	. "It also uses up server bandwidth on every connect, "	1048	. "It also uses up server bandwidth on every connect, "
801	. "so only set it if you really need to prefetch images. "	1049	. "so only set it if you really need to prefetch images. "
802	. "This option can be set and unset any time.",	1050	. "This option can be set and unset any time.",
803	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1051	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
804	);	1052	);
805		1053
806	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1054	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
807	$table->add (1, 9, new CFClient::UI::Entry	1055	$table->add (1, 9, new CFPlus::UI::Entry
808	text => $CFG->{output_count},	1056	text => $CFG->{output_count},
809	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1057	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
810	on_changed => sub { $CFG->{output_count} = $_[1] },	1058	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
811	);	1059	);
812		1060
813	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1061	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
814	$table->add (1, 10, new CFClient::UI::Entry	1062	$table->add (1, 10, new CFPlus::UI::Entry
815	text => $CFG->{output_sync},	1063	text => $CFG->{output_sync},
816	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1064	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
817	on_changed => sub { $CFG->{output_sync} = $_[1] },	1065	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
818	);	1066	);
819		1067
820	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1068	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
821	expand => 1,	1069	expand => 1,
822	align => 0,	1070	align => 0,
823	text => "Login",	1071	text => "Login",
824	on_activate => sub {	1072	on_activate => sub {
825	$CONN ? stop_game	1073	$CONN ? stop_game
826	: start_game;	1074	: start_game;
		1075	0
827	},	1076	},
828	);	1077	);
829		1078
830	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1079	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
831	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1080	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
832	text => $CFG->{say_command},	1081	text => $CFG->{say_command},
833	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1082	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
834	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1083	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
835	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1084	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
836	on_changed => sub {	1085	on_changed => sub {
837	my ($self, $value) = @_;	1086	my ($self, $value) = @_;
838	$CFG->{say_command} = $value;	1087	$CFG->{say_command} = $value;
		1088	0
839	}	1089	}
		1090	);
		1091
		1092	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1093	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1094	state => $CFG->{show_tips},
		1095	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1096	on_changed => sub {
		1097	my ($self, $value) = @_;
		1098	$CFG->{show_tips} = $value;
		1099	0
		1100	}
		1101	);
		1102
		1103	$vbox->add (new CFPlus::UI::FancyFrame
		1104	label => "Server Info",
		1105	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
840	);	1106	);
841		1107
842	$vbox	1108	$vbox
843	}	1109	}
844		1110
845	sub message_window {	1111	sub message_window {
846	my $window = new CFClient::UI::FancyFrame	1112	my $window = new CFPlus::UI::Toplevel
847	name => "message_window",	1113	name => "message_window",
848	title => "Messages",	1114	title => "Messages",
849	border_bg => [1, 1, 1, 1],	1115	border_bg => [1, 1, 1, 1],
850	bg => [0, 0, 0, 0.75],
851	x => "max",	1116	x => "max",
852	y => 0,	1117	y => 0,
853	force_w => $::WIDTH / 3,	1118	force_w => $::WIDTH * 0.4,
854	force_h => $::HEIGHT / 5,	1119	force_h => $::HEIGHT * 0.5,
855	child => (my $vbox = new CFClient::UI::VBox);	1120	child => (my $vbox = new CFPlus::UI::VBox),
		1121	has_close_button => 1;
856		1122
857	$vbox->add ($LOGVIEW);	1123	$vbox->add ($LOGVIEW);
858		1124
859	$vbox->add (my $input = new CFClient::UI::Entry	1125	$vbox->add (my $input = new CFPlus::UI::Entry
860	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1126	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
861	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1127	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
862	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1128	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
863	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1129	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
864	on_focus_in => sub {	1130	on_focus_in => sub {
…		…
868		1134
869	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1135	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
870	$input->{refocus_map} = 1;	1136	$input->{refocus_map} = 1;
871	}	1137	}
872	delete $input->{auto_activated};	1138	delete $input->{auto_activated};
		1139
		1140	0
873	},	1141	},
874	on_activate => sub {	1142	on_activate => sub {
875	my ($input, $text) = @_;	1143	my ($input, $text) = @_;
876	$input->set_text ('');	1144	$input->set_text ('');
877		1145
…		…
883	}	1151	}
884	if ($input->{refocus_map}) {	1152	if ($input->{refocus_map}) {
885	delete $input->{refocus_map};	1153	delete $input->{refocus_map};
886	$MAPWIDGET->focus_in	1154	$MAPWIDGET->focus_in
887	}	1155	}
		1156
		1157	0
888	},	1158	},
889	on_escape => sub {	1159	on_escape => sub {
890	$MAPWIDGET->focus_in	1160	$MAPWIDGET->grab_focus;
		1161
		1162	0
891	},	1163	},
892	);	1164	);
893		1165
894	$CONSOLE = {	1166	$CONSOLE = {
895	window => $window,	1167	window => $window,
…		…
897	};	1169	};
898		1170
899	$window	1171	$window
900	}	1172	}
901		1173
902	sub open_quit_dialog {
903	unless ($QUIT_DIALOG) {
904	$QUIT_DIALOG = new CFClient::UI::FancyFrame
905	x => "center",
906	y => "center",
907	z => 50,
908	title => "Really Quit?",
909	;
910
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912
913	$vb->add (new CFClient::UI::Label
914	text => "You should find a savebed and apply it first!",
915	max_w => $WIDTH * 0.25,
916	ellipsize => 0,
917	);
918	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919	$hb->add (new CFClient::UI::Button
920	text => "Ok",
921	expand => 1,
922	on_activate => sub { $QUIT_DIALOG->hide },
923	);
924	$hb->add (new CFClient::UI::Button
925	text => "Quit anyway",
926	expand => 1,
927	on_activate => sub { exit },
928	);
929	}
930
931	$QUIT_DIALOG->show;
932	}
933
934	sub autopickup_setup {	1174	sub autopickup_setup {
935	my $table = new CFClient::UI::Table;	1175	my $table = new CFPlus::UI::Table;
936		1176
937	for (	1177	for (
938	["General", 0, 0,	1178	["General", 0, 0,
939	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1179	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
940	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1180	["Inhibit autopickup" => PICKUP_INHIBIT],
941	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1181	["Stop before pickup" => PICKUP_STOP],
942	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1182	["Debug autopickup" => PICKUP_DEBUG],
943	],	1183	],
944	["Weapons", 0, 6,	1184	["Weapons", 0, 6,
945	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1185	["All weapons" => PICKUP_ALLWEAPON],
946	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1186	["Missile weapons" => PICKUP_MISSILEWEAPON],
947	["Bows" => CFClient::Pickup::PU_BOW],	1187	["Bows" => PICKUP_BOW],
948	["Arrows" => CFClient::Pickup::PU_ARROW],	1188	["Arrows" => PICKUP_ARROW],
949	],	1189	],
950	["Armour", 0, 12,	1190	["Armour", 0, 12,
951	["Helmets" => CFClient::Pickup::PU_HELMET],	1191	["Helmets" => PICKUP_HELMET],
952	["Shields" => CFClient::Pickup::PU_SHIELD],	1192	["Shields" => PICKUP_SHIELD],
953	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1193	["Body Armour" => PICKUP_ARMOUR],
954	["Boots" => CFClient::Pickup::PU_BOOTS],	1194	["Boots" => PICKUP_BOOTS],
955	["Gloves" => CFClient::Pickup::PU_GLOVES],	1195	["Gloves" => PICKUP_GLOVES],
956	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1196	["Cloaks" => PICKUP_CLOAK],
957	],	1197	],
958		1198
959	["Readables", 2, 2,	1199	["Readables", 2, 0,
960	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1200	["Spellbooks" => PICKUP_SPELLBOOK],
961	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1201	["Skillscrolls" => PICKUP_SKILLSCROLL],
962	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1202	["Normal Books/Scrolls" => PICKUP_READABLES],
963	],	1203	],
964	["Misc", 2, 7,	1204	["Misc", 2, 5,
965	["Food" => CFClient::Pickup::PU_FOOD],	1205	["Food" => PICKUP_FOOD],
966	["Drinks" => CFClient::Pickup::PU_DRINK],	1206	["Drinks" => PICKUP_DRINK],
967	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1207	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968	["Keys" => CFClient::Pickup::PU_KEY],	1208	["Keys" => PICKUP_KEY],
969	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1209	["Magical Items" => PICKUP_MAGICAL],
970	["Potions" => CFClient::Pickup::PU_POTION],	1210	["Potions" => PICKUP_POTION],
971	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1211	["Magic Devices" => PICKUP_MAGIC_DEVICE],
972	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1212	["Ignore cursed" => PICKUP_NOT_CURSED],
973	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1213	["Jewelery" => PICKUP_JEWELS],
		1214	["Flesh" => PICKUP_FLESH],
974	],	1215	],
		1216	["Weight/Value ratio", 2, 17]
975	)	1217	)
976	{	1218	{
977	my ($title, $x, $y, @bits) = @$_;	1219	my ($title, $x, $y, @bits) = @$_;
978	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1220	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979		1221
980	for (@bits) {	1222	for (@bits) {
981	++$y;	1223	++$y;
982		1224
983	my $mask = $_->[1];	1225	my $mask = $_->[1];
984	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1226	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
985	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1227	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
986	state => $CFG->{pickup} & $mask,	1228	state => $::CFG->{pickup} & $mask,
987	on_changed => sub {	1229	on_changed => sub {
988	my ($box, $value) = @_;	1230	my ($box, $value) = @_;
		1231
989	if ($value) {	1232	if ($value) {
990	$::CFG->{pickup} |= $mask;	1233	$::CFG->{pickup} |= $mask;
991	} else {	1234	} else {
992	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1235	$::CFG->{pickup} &= ~$mask;
993	}	1236	}
		1237
994	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1238	$::CONN->send_command ("pickup $::CFG->{pickup}")
995	if defined $::CONN;	1239	if defined $::CONN;
		1240
		1241	0
996	});	1242	});
		1243
		1244	${$_->[2]} = $checkbox if $_->[2];
997	}	1245	}
998	}	1246	}
999		1247
		1248	$table->add (2, 18, new CFPlus::UI::ValSlider
		1249	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1250	template => ">= 99",
		1251	to_value => sub { ">= " . 5 * $_[0] },
		1252	on_changed => sub {
		1253	my ($slider, $value) = @_;
		1254
		1255	$::CFG->{pickup} &= ~0xF;
		1256	$::CFG->{pickup} |= int $value
		1257	if $value;
		1258	1;
		1259	});
		1260
		1261	$table->add (3, 18, new CFPlus::UI::Button
		1262	text => "set",
		1263	on_activate => sub {
		1264	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1265	if defined $::CONN;
		1266	0
		1267	});
		1268
1000	$table	1269	$table
1001	}	1270	}
1002		1271
		1272	my %SORT_ORDER = (
		1273	type => undef,
		1274	mtime => sub {
		1275	my $NOW = time;
		1276	sort {
		1277	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1278	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1279
		1280	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1281	or $btime <=> $atime
		1282	or $a->{type} <=> $b->{type}
		1283	} @_
		1284	},
		1285	weight => sub { sort {
		1286	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1287	or $a->{type} <=> $b->{type}
		1288	} @_ },
		1289	);
		1290
1003	sub make_inventory_window {	1291	sub inventory_widget {
1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1292	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1293
		1294	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		1295	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1296
		1297	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1298
		1299	use sort 'stable';
		1300
		1301	$hb1->add (new CFPlus::UI::Selector
		1302	value => $::CFG->{inv_sort},
		1303	options => [
		1304	[type => "Type/Name"],
		1305	[mtime => "Recent/Normal/Locked"],
		1306	[weight => "Weight/Type"],
		1307	],
		1308	on_changed => sub {
		1309	$::CFG->{inv_sort} = $_[1];
		1310	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1311	},
		1312	);
		1313	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1314	#TODO# update to weigh/maxweight
		1315	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1316
		1317	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1318	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1319	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
		1320
		1321	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1322
		1323	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1324
		1325	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1326	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1327
		1328	# XXX: Call after $INVR = ... because set_opencont sets the items
		1329	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1330
		1331	$hb
		1332	}
		1333
		1334	sub toggle_player_page {
		1335	my ($widget) = @_;
		1336
		1337	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1338	$PL_WINDOW->hide;
		1339	} else {
		1340	$PL_NOTEBOOK->set_current_page ($widget);
		1341	$PL_WINDOW->show;
		1342	}
		1343	}
		1344
		1345	sub player_window {
		1346	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1005	x => "center",	1347	x => "center",
1006	y => "center",	1348	y => "center",
1007	force_w => $WIDTH * 9/10,	1349	force_w => $WIDTH * 9/10,
1008	force_h => $HEIGHT * 9/10,	1350	force_h => $HEIGHT * 9/10,
1009	title => "Inventory",	1351	title => "Player",
		1352	name => "playerbook",
		1353	has_close_button => 1
1010	;	1354	;
1011		1355
1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1356	my $ntb =
		1357	$PL_NOTEBOOK =
		1358	new CFPlus::UI::Notebook expand => 1, debug => 1;
1013		1359
1014	$hb->add (my $vb1 = new CFClient::UI::VBox);	1360	$ntb->add (
1015	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1361	"Statistics (F2)" => $STATS_PAGE = stats_window,
1016	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1362	"Shows statistics, where all your Stats and Resistances are shown."
		1363	);
		1364	$ntb->add (
		1365	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1366	"Shows all your Skills."
		1367	);
1017		1368
1018	$hb->add (my $vb2 = new CFClient::UI::VBox);	1369	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1370	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
		1371	$ntb->add (
		1372	"Spellbook (F4)" => $spellsw,
		1373	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1374	);
		1375	$ntb->add (
		1376	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1377	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1378	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1379	);
1019		1380
1020	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1381	$ntb->set_current_page ($INVENTORY_PAGE);
1021		1382
1022	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1383	$plwin->add ($ntb);
1023		1384	$plwin
1024	# XXX: Call after $INVR = ... because set_opencont sets the items
1025	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027	$invwin
1028	}	1385	}
1029		1386
1030	sub spell_setup {	1387	sub update_bindings {
1031	new CFClient::UI::SpellList	1388	$BIND_UPD_CB->() if $BIND_UPD_CB;
1032	}	1389	}
1033		1390
1034	sub keyboard_setup {	1391	sub keyboard_setup {
1035	my $binding_list = new CFClient::UI::VBox;	1392	my $binding_list = new CFPlus::UI::VBox;
1036		1393
1037	my $refresh;	1394	my $refresh;
1038	$refresh = sub {	1395	$refresh = $BIND_UPD_CB = sub {
1039	$binding_list->clear ();	1396	$binding_list->clear ();
1040		1397
		1398	return unless $PROFILE;
		1399
1041	for my $mod (keys %{$::CFG->{bindings}}) {	1400	for my $mod (keys %{$PROFILE->{bindings}}) {
1042	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1401	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1043	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1402	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1044	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1403	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045		1404
1046	my $lbl = join "; ", @$cmds;	1405	my $lbl = join "; ", @$cmds;
1047	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1406	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1048	$binding_list->add (my $hb = new CFClient::UI::HBox);	1407	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1049	$hb->add (new CFClient::UI::Button	1408	$hb->add (new CFPlus::UI::Button
1050	text => "delete",	1409	text => "delete",
1051	tooltip => "Deletes the binding",	1410	tooltip => "Deletes the binding",
1052	on_activate => sub {	1411	on_activate => sub {
1053	$binding_list->remove ($hb);	1412	$binding_list->remove ($hb);
1054	delete $::CFG->{bindings}->{$mod}->{$sym};	1413	delete $PROFILE->{bindings}{$mod}{$sym};
		1414	0
1055	});	1415	});
1056		1416
1057	$hb->add (new CFClient::UI::Button	1417	$hb->add (new CFPlus::UI::Button
1058	text => "edit",	1418	text => "edit",
1059	tooltip => "Edits the binding",	1419	tooltip => "Edits the binding",
1060	on_activate => sub {	1420	on_activate => sub {
1061	$::BIND_EDITOR->set_binding (	1421	$::BIND_EDITOR->set_binding (
1062	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1422	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1063	sub {	1423	sub {
1064	my ($nmod, $nsym, $ncmds) = @_;	1424	my ($nmod, $nsym, $ncmds) = @_;
1065	delete $::CFG->{bindings}->{$mod}->{$sym};	1425	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1066	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1426	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1067	$refresh->();	1427	$refresh->();
1068	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1428	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069	$SETUP_DIALOG->show;	1429	$SETUP_DIALOG->show;
1070	},	1430	},
1071	sub {	1431	sub {
1072	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1432	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073	$SETUP_DIALOG->show;	1433	$SETUP_DIALOG->show;
1074	});	1434	});
1075	$::BIND_EDITOR->show;	1435	$::BIND_EDITOR->show;
1076	$SETUP_DIALOG->hide;	1436	$SETUP_DIALOG->hide;
		1437	0
1077	});	1438	});
1078		1439
1079	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1440	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1080	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1441	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1081	}	1442	}
1082	}	1443	}
1083	};	1444	};
1084		1445
1085	my $vb = new CFClient::UI::VBox;	1446	my $vb = new CFPlus::UI::VBox;
1086	$vb->add ($binding_list);	1447	$vb->add (new CFPlus::UI::FancyFrame
		1448	label => "Options",
		1449	child => (my $hb = new CFPlus::UI::HBox),
		1450	);
		1451	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
		1452	$hb->add (new CFPlus::UI::CheckBox
		1453	expand => 1,
		1454	state => $CFG->{shift_fire_stop},
		1455	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1456	on_changed => sub {
		1457	my ($cbox, $value) = @_;
		1458	$CFG->{shift_fire_stop} = $value;
		1459	0
		1460	});
		1461
		1462	$vb->add (new CFPlus::UI::FancyFrame
		1463	label => "Bindings",
		1464	child => $binding_list);
1087	$vb->add (my $hb = new CFClient::UI::HBox);	1465	$vb->add (my $hb = new CFPlus::UI::HBox);
1088		1466
1089	$hb->add (new CFClient::UI::Button	1467	$hb->add (new CFPlus::UI::Button
1090	text => "record new",	1468	text => "record new",
1091	expand => 1,	1469	expand => 1,
1092	tooltip => "This button opens the binding editor with an empty binding.",	1470	tooltip => "This button opens the binding editor with an empty binding.",
1093	on_activate => sub {	1471	on_activate => sub {
1094	$::BIND_EDITOR->set_binding (undef, undef, [],	1472	$::BIND_EDITOR->set_binding (undef, undef, [],
1095	sub {	1473	sub {
1096	my ($mod, $sym, $cmds) = @_;	1474	my ($mod, $sym, $cmds) = @_;
1097	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1475	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1098	$refresh->();	1476	$refresh->();
1099	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1477	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100	$SETUP_DIALOG->show;	1478	$SETUP_DIALOG->show;
1101	},	1479	},
1102	sub {	1480	sub {
…		…
1104	$SETUP_DIALOG->show;	1482	$SETUP_DIALOG->show;
1105	},	1483	},
1106	);	1484	);
1107	$SETUP_DIALOG->hide;	1485	$SETUP_DIALOG->hide;
1108	$::BIND_EDITOR->show;	1486	$::BIND_EDITOR->show;
		1487	0
1109	},	1488	},
1110	);	1489	);
1111		1490
1112	$hb->add (new CFClient::UI::Button	1491	$hb->add (new CFPlus::UI::Button
1113	text => "close",	1492	text => "close",
1114	tooltip => "Closes the binding window",	1493	tooltip => "Closes the binding window",
1115	expand => 1,	1494	expand => 1,
1116	on_activate => sub {	1495	on_activate => sub {
1117	$SETUP_DIALOG->hide;	1496	$SETUP_DIALOG->hide;
		1497	0
1118	}	1498	}
1119	);	1499	);
1120		1500
1121	$refresh->();	1501	$refresh->();
1122		1502
1123	$vb	1503	$vb
1124	}	1504	}
1125		1505
1126	sub make_help_window {	1506	sub help_window {
1127	my $win = new CFClient::UI::FancyFrame	1507	my $win = new CFPlus::UI::Toplevel
1128	x => 'center',	1508	x => 'center',
1129	y => 'center',	1509	y => 'center',
1130	z => 2,	1510	z => 4,
1131	name => 'doc_browser',	1511	name => 'doc_browser',
1132	force_w => int $WIDTH * 7/8,	1512	force_w => int $WIDTH * 7/8,
1133	force_h => int $HEIGHT * 7/8,	1513	force_h => int $HEIGHT * 7/8,
1134	title => "Documentation";	1514	title => "Help Browser",
		1515	has_close_button => 1;
1135		1516
1136	$win->add (my $vbox = new CFClient::UI::VBox);	1517	$win->add (my $vbox = new CFPlus::UI::VBox);
1137		1518
1138	$vbox->add (my $buttons = new CFClient::UI::HBox);	1519	$vbox->add (new CFPlus::UI::FancyFrame
1139	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1520	label => "Navigation",
		1521	child => (my $buttons = new CFPlus::UI::HBox),
		1522	);
		1523	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1524	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1140		1525
1141	for (	1526	my @history;
1142	[intro => "Introduction"],	1527	my @future;
1143	[manual => "Manual"],	1528	my $curnode;
1144	[command_help => "Commands"],	1529
1145	[skill_help => "Skills"],	1530	my $load_node; $load_node = sub {
1146	) {
1147	my ($pod, $label) = @$_;	1531	my ($node, $para) = @_;
1148		1532
		1533	$buttons->clear;
		1534
1149	$buttons->add (new CFClient::UI::Button	1535	$buttons->add (new CFPlus::UI::Button
1150	text => $label,	1536	text => "⇤",
		1537	tooltip => "back to the starting page",
1151	on_activate => sub {	1538	on_activate => sub {
1152	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";	1539	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1153		1540	unshift @future, @history;
1154	$viewer->clear;	1541	@history = ();
1155		1542	$load_node->(@{shift @future});
1156	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157	for @{ CFClient::pod_to_pango_list $pom };
1158
1159	$viewer->set_offset (0);
1160	},	1543	},
1161	);	1544	);
		1545
		1546	if (@history) {
		1547	$buttons->add (new CFPlus::UI::Button
		1548	text => "⋘",
		1549	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1550	on_activate => sub {
		1551	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1552	$load_node->(@{pop @history});
		1553	},
		1554	);
		1555	}
		1556
		1557	if (@future) {
		1558	$buttons->add (new CFPlus::UI::Button
		1559	text => "⋙",
		1560	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1561	on_activate => sub {
		1562	push @history, [$curnode, $viewer->current_paragraph];
		1563	$load_node->(@{shift @future});
		1564	},
		1565	);
		1566	}
		1567
		1568	$buttons->add (new CFPlus::UI::Label text => " ");
		1569
		1570	my @path = CFPlus::Pod::full_path_of $node;
		1571	pop @path; # drop current node
		1572
		1573	for my $node (@path) {
		1574	$buttons->add (new CFPlus::UI::Button
		1575	text => $node->{kw}[0],
		1576	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1577	on_activate => sub {
		1578	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1579	$load_node->($node);
		1580	},
		1581	);
		1582	$buttons->add (new CFPlus::UI::Label text => "/");
		1583	}
		1584
		1585	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1586
		1587	$curnode = $node;
		1588
		1589	$viewer->clear;
		1590	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1591	$viewer->scroll_to ($para);
		1592	};
		1593
		1594	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1595
		1596	$CFPlus::Pod::goto_document = sub {
		1597	my (@path) = @_;
		1598
		1599	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1600
		1601	$load_node->((CFPlus::Pod::find @path)[0]);
		1602	$win->show;
		1603	};
		1604
		1605	$win
		1606	}
		1607
		1608	sub open_string_query {
		1609	my ($title, $cb, $txt, $tooltip) = @_;
		1610	my $dialog = new CFPlus::UI::Toplevel
		1611	x => "center",
		1612	y => "center",
		1613	z => 50,
		1614	force_w => $WIDTH * 4/5,
		1615	title => $title;
		1616
		1617	$dialog->add (
		1618	my $e = new CFPlus::UI::Entry
		1619	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1620	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1621	tooltip => $tooltip
		1622	);
		1623
		1624	$e->grab_focus;
		1625	$e->set_text ($txt) if $txt;
		1626	$dialog->show;
		1627	}
		1628
		1629	sub open_quit_dialog {
		1630	unless ($QUIT_DIALOG) {
		1631	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1632	x => "center",
		1633	y => "center",
		1634	z => 50,
		1635	title => "Really Quit?",
		1636	on_key_down => sub {
		1637	my ($dialog, $ev) = @_;
		1638	$ev->{sym} == 27 and $dialog->hide;
		1639	}
		1640	;
		1641
		1642	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1643
		1644	$vb->add (new CFPlus::UI::Label
		1645	text => "You should find a savebed and apply it first!",
		1646	max_w => $WIDTH * 0.25,
		1647	ellipsize => 0,
		1648	);
		1649	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1650	$hb->add (new CFPlus::UI::Button
		1651	text => "Ok",
		1652	expand => 1,
		1653	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1654	);
		1655	$hb->add (new CFPlus::UI::Button
		1656	text => "Quit anyway",
		1657	expand => 1,
		1658	on_activate => sub { exit },
		1659	);
1162	}	1660	}
1163		1661
1164	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");	1662	$QUIT_DIALOG->show;
		1663	$QUIT_DIALOG->grab_focus;
		1664	}
1165		1665
1166	$win	1666	sub show_tip_of_the_day {
		1667	# find all tips
		1668	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1669
		1670	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1671	$todindex = 0 if $todindex >= @tod;
		1672	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1673
		1674	# create dialog
		1675	my $dialog;
		1676
		1677	my $close = sub {
		1678	$dialog->destroy;
		1679	};
		1680
		1681	$dialog = new CFPlus::UI::Toplevel
		1682	x => "center",
		1683	y => "center",
		1684	z => 3,
		1685	name => 'tip_of_the_day',
		1686	force_w => int $WIDTH * 4/9,
		1687	force_h => int $WIDTH * 2/9,
		1688	title => "Tip of the day #" . (1 + $todindex),
		1689	child => my $vbox = new CFPlus::UI::VBox,
		1690	has_close_button => 1,
		1691	on_delete => $close,
		1692	;
		1693
		1694	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1695	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1696	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1697
		1698	$vbox->add (my $table = new CFPlus::UI::Table);
		1699
		1700	$table->add (0, 0, new CFPlus::UI::Button
		1701	text => "Close",
		1702	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1703	on_activate => $close,
		1704	);
		1705
		1706	$table->add (2, 0, new CFPlus::UI::Button
		1707	text => "Next",
		1708	tooltip => "Show the next <b>Tip of the day</b>.",
		1709	on_activate => sub {
		1710	$close->();
		1711	&show_tip_of_the_day;
		1712	},
		1713	);
		1714
		1715	$dialog->show;
1167	}	1716	}
1168		1717
1169	sub sdl_init {	1718	sub sdl_init {
1170	CFClient::SDL_Init	1719	CFPlus::SDL_Init
1171	and die "SDL::Init failed!\n";	1720	and die "SDL::Init failed!\n";
1172	}	1721	}
1173		1722
1174	sub video_init {	1723	sub video_init {
1175	sdl_init;	1724	sdl_init;
…		…
1180		1729
1181	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1730	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1182	$FULLSCREEN = $CFG->{fullscreen};	1731	$FULLSCREEN = $CFG->{fullscreen};
1183	$FAST = $CFG->{fast};	1732	$FAST = $CFG->{fast};
1184		1733
1185	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1734	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1186	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1735	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1187		1736
1188	$SDL_ACTIVE = 1;	1737	$SDL_ACTIVE = 1;
1189	$LAST_REFRESH = time - 0.01;	1738	$LAST_REFRESH = time - 0.01;
1190		1739
1191	CFClient::OpenGL::init;	1740	CFPlus::OpenGL::init;
1192		1741
1193	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1742	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1194		1743
1195	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1744	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1196		1745
1197	#############################################################################	1746	#############################################################################
1198		1747
1199	if ($DEBUG_STATUS) {	1748	if ($DEBUG_STATUS) {
1200	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1749	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1201	} else {	1750	} else {
1202	# create the widgets	1751	# create the widgets
1203		1752
1204	$DEBUG_STATUS = new CFClient::UI::Label	1753	$DEBUG_STATUS = new CFPlus::UI::Label
1205	padding => 0,	1754	padding => 0,
1206	z => 100,	1755	z => 100,
1207	force_x => "max",	1756	force_x => "max",
1208	force_y => 0;	1757	force_y => 0;
1209	$DEBUG_STATUS->show;	1758	$DEBUG_STATUS->show;
1210		1759
1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1760	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1212		1761
1213	$STATUSBOX = new CFClient::UI::Statusbox;	1762	$STATUSBOX = new CFPlus::UI::Statusbox;
1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1763	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1215		1764
1216	(new CFClient::UI::Frame	1765	(new CFPlus::UI::Frame
1217	bg => [0, 0, 0, 0.4],	1766	bg => [0, 0, 0, 0.4],
1218	force_x => 0,	1767	force_x => 0,
1219	force_y => "max",	1768	force_y => "max",
1220	child => $STATUSBOX,	1769	child => $STATUSBOX,
1221	)->show;	1770	)->show;
1222		1771
1223	CFClient::UI::FancyFrame->new (	1772	CFPlus::UI::Toplevel->new (
1224	title => "Map",	1773	title => "Map",
1225	name => "mapmap",	1774	name => "mapmap",
1226	x => 0,	1775	x => 0,
1227	y => $FONTSIZE + 8,	1776	y => $FONTSIZE + 8,
1228	border_bg => [1, 1, 1, 192/255],	1777	border_bg => [1, 1, 1, 192/255],
1229	bg => [1, 1, 1, 0],	1778	bg => [1, 1, 1, 0],
1230	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1779	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1231	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1780	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1232	),	1781	),
1233	)->show;	1782	)->show;
1234		1783
1235	$MAPWIDGET = new CFClient::MapWidget;	1784	$MAPWIDGET = new CFPlus::MapWidget;
1236	$MAPWIDGET->connect (activate_console => sub {	1785	$MAPWIDGET->connect (activate_console => sub {
1237	my ($mapwidget, $preset) = @_;	1786	my ($mapwidget, $preset) = @_;
1238		1787
1239	if ($CONSOLE) {	1788	if ($CONSOLE) {
1240	$CONSOLE->{input}->{auto_activated} = 1;	1789	$CONSOLE->{input}->{auto_activated} = 1;
1241	$CONSOLE->{input}->focus_in;	1790	$CONSOLE->{input}->grab_focus;
1242		1791
1243	if ($preset && $CONSOLE->{input}->get_text eq '') {	1792	if ($preset && $CONSOLE->{input}->get_text eq '') {
1244	$CONSOLE->{input}->set_text ($preset);	1793	$CONSOLE->{input}->set_text ($preset);
1245	}	1794	}
1246	}	1795	}
1247	});	1796	});
1248	$MAPWIDGET->show;	1797	$MAPWIDGET->show;
1249	$MAPWIDGET->focus_in;	1798	$MAPWIDGET->grab_focus;
1250		1799
1251	$LOGVIEW = new CFClient::UI::TextView	1800	$LOGVIEW = new CFPlus::UI::TextScroller
1252	expand => 1,	1801	expand => 1,
1253	font => $FONT_FIXED,	1802	font => $FONT_FIXED,
1254	fontsize => $::CFG->{log_fontsize},	1803	fontsize => $::CFG->{log_fontsize},
		1804	indent => -4,
1255	can_hover => 1,	1805	can_hover => 1,
1256	can_events => 1,	1806	can_events => 1,
1257	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1807	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258	;	1808	;
1259		1809
1260	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1810	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1261	title => "Setup",	1811	title => "Setup",
1262	name => "setup_dialog",	1812	name => "setup_dialog",
1263	x => 'center',	1813	x => 'center',
1264	y => 'center',	1814	y => 'center',
1265	z => 2,	1815	z => 2,
1266	force_w => $::WIDTH * 0.6,	1816	force_w => $::WIDTH * 0.6,
1267	force_h => $::HEIGHT * 0.6,	1817	force_h => $::HEIGHT * 0.6,
		1818	has_close_button => 1,
1268	;	1819	;
1269		1820
		1821	$METASERVER = metaserver_dialog;
		1822
1270	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1823	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1271	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1824	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272		1825
1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1826	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274	"Configure the server to play on, your username, password and other server-related options.");	1827	"Configure the server to play on, your username, password and other server-related options.");
1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1828	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1829	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1830	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1831	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1832	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1280	"Configure the use of audio, sound effects and background music.");	1833	"Configure the use of audio, sound effects and background music.");
1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1834	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282	"Lets you define, edit and delete bindings."	1835	"Lets you define, edit and delete key bindings."
1283	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1836	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284	. "with nothing set and the recording started. After doing the actions you "	1837	. "with nothing set and the recording started. After doing the actions you "
1285	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1838	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286	. "After pressing the combo the binding will be saved automatically and the "	1839	. "After pressing the combo the binding will be saved automatically and the "
1287	. "binding editor closes");	1840	. "binding editor closes");
1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1841	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1842	"Some debuggin' options. Do not ask.");
1290		1843
1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1844	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292		1845
1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1846	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1847	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295		1848
1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1849	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1850	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298		1851
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	1852	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
1300		1853
1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1854	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1855	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1305	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306		1856
1307	$BUTTONBAR->add (new CFClient::UI::Button	1857	$BUTTONBAR->add (new CFPlus::UI::Button
1308	text => "Save Config",	1858	text => "Save Config",
1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1859	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310	on_activate => sub {	1860	on_activate => sub {
1311	$::CFG->{layout} = CFClient::UI::get_layout;	1861	$::CFG->{layout} = CFPlus::UI::get_layout;
1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1862	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313	status "Configuration Saved";	1863	status "Configuration Saved";
		1864	0
1314	},	1865	},
1315	);	1866	);
1316		1867
1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1868	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1318	tooltip => "View Documentation");	1869	tooltip => "View Documentation");
1319		1870
		1871
1320	$BUTTONBAR->add (new CFClient::UI::Button	1872	$BUTTONBAR->add (new CFPlus::UI::Button
1321	text => "Quit",	1873	text => "Quit",
1322	tooltip => "Terminates the program",	1874	tooltip => "Terminates the program",
1323	on_activate => sub {	1875	on_activate => sub {
1324	if ($CONN) {	1876	if ($CONN) {
1325	open_quit_dialog;	1877	open_quit_dialog;
1326	} else {	1878	} else {
1327	exit;	1879	exit;
1328	}	1880	}
		1881	0
1329	},	1882	},
1330	);	1883	);
1331		1884
1332	$BUTTONBAR->show;	1885	$BUTTONBAR->show;
1333	$SETUP_DIALOG->show;	1886	$SETUP_DIALOG->show;
1334	}	1887	}
1335		1888
1336	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1889	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337	}	1890	}
1338		1891
		1892	sub setup_build_button {
		1893	my ($enabled) = @_;
		1894	if ($enabled) {
		1895	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1896	text => "Build",
		1897	tooltip => "Opens the ingame builder",
		1898	on_activate => sub {
		1899	if ($CONN) {
		1900	$CONN->send_ext_req (builder_player_items => sub {
		1901	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1902	});
		1903	}
		1904	0
		1905	};
		1906	$BUTTONBAR->add ($BUILD_BUTTON);
		1907	} else {
		1908	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1909	}
		1910	}
		1911
		1912	sub open_ingame_editor {
		1913	my ($msg) = @_;
		1914
		1915	my $win = new CFPlus::UI::Toplevel
		1916	x => 0,
		1917	y => 'center',
		1918	z => 4,
		1919	name => 'builder_window',
		1920	force_w => int $WIDTH * 1/4,
		1921	force_h => int $HEIGHT * 3/4,
		1922	title => "In game builder",
		1923	has_close_button => 1;
		1924
		1925	my $r = new CFPlus::UI::ScrolledWindow (
		1926	expand => 1,
		1927	scroll_y => 1
		1928	);
		1929	$r->add (my $vb = new CFPlus::UI::VBox);
		1930	$win->add ($r);
		1931
		1932
		1933	$vb->add (
		1934	new CFPlus::UI::Button
		1935	text => "Disable build mode",
		1936	on_activate => sub { $::IN_BUILD_MODE = undef }
		1937	);
		1938	$vb->add (
		1939	new CFPlus::UI::Button
		1940	text => "ERASE",
		1941	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1942	);
		1943
		1944	for my $itemarchname (
		1945	sort {
		1946	$msg->{items}->{$a}->{build_arch_name}
		1947	cmp $msg->{items}->{$b}->{build_arch_name}
		1948	} keys %{$msg->{items}}
		1949	) {
		1950	my $info = $msg->{items}->{$itemarchname};
		1951	$vb->add (
		1952	new CFPlus::UI::Button text => $info->{build_arch_name},
		1953	on_activate => sub {
		1954	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1955
		1956	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1957	build_mode_query_arch_info ();
		1958	}
		1959	}
		1960	);
		1961	}
		1962
		1963	$win->show;
		1964	}
		1965
		1966	sub build_mode_query_arch_info {
		1967	my ($iteminfo) = $::IN_BUILD_MODE;
		1968	my $itemarchname = $iteminfo->{item};
		1969	my $info = $iteminfo->{info};
		1970
		1971	my $dialog = new CFPlus::UI::Toplevel
		1972	x => "center",
		1973	y => "center",
		1974	z => 50,
		1975	force_w => int $WIDTH * 1/2,
		1976	title => "Enter information for placement of '$itemarchname'",
		1977	has_close_button => 1;
		1978
		1979	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1980
		1981	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1982	my $row = 0;
		1983	if ($info->{has_name}) {
		1984	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
		1985	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1986	}
		1987	if ($info->{has_text}) {
		1988	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
		1989	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1990	}
		1991	if ($info->{has_connection}) {
		1992	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1993	$table->add (1, $row++,
		1994	new CFPlus::UI::Entry
		1995	expand => 1,
		1996	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1997	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1998	);
		1999	}
		2000
		2001	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		2002	$hb->add (new CFPlus::UI::Button
		2003	text => "Close",
		2004	expand => 1,
		2005	on_activate => sub { $dialog->hide; 0 },
		2006	);
		2007	$dialog->show;
		2008	}
		2009
1339	sub video_shutdown {	2010	sub video_shutdown {
		2011	CFPlus::OpenGL::shutdown;
		2012
1340	undef $SDL_ACTIVE;	2013	undef $SDL_ACTIVE;
1341	}	2014	}
1342		2015
1343	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	2016	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344	my $bgmusic;#TODO#hack#d#	2017	my $bgmusic;#TODO#hack#d#
…		…
1351		2024
1352	sub audio_music_finished {	2025	sub audio_music_finished {
1353	return unless $CFG->{bgm_enable};	2026	return unless $CFG->{bgm_enable};
1354		2027
1355	# TODO: hack, do play loop and mood music	2028	# TODO: hack, do play loop and mood music
1356	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	2029	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1357	$bgmusic->play (0);	2030	$bgmusic->play (0);
1358		2031
1359	push @bgmusic, shift @bgmusic;	2032	push @bgmusic, shift @bgmusic;
1360	}	2033	}
1361		2034
1362	sub audio_init {	2035	sub audio_init {
1363	if ($CFG->{audio_enable}) {	2036	if ($CFG->{audio_enable}) {
1364	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2037	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1365	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2038	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1366		2039
1367	unless ($SDL_MIXER) {	2040	unless ($SDL_MIXER) {
1368	status "Unable to open sound device: there will be no sound";	2041	status "Unable to open sound device: there will be no sound";
1369	return;	2042	return;
1370	}	2043	}
1371		2044
1372	CFClient::Mix_AllocateChannels 8;	2045	CFPlus::Mix_AllocateChannels 8;
1373	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2046	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1374		2047
1375	audio_music_finished;	2048	audio_music_finished;
1376		2049
		2050	local $_;
1377	while (<$fh>) {	2051	while (<$fh>) {
1378	next if /^\s*#/;	2052	next if /^\s*#/;
1379	next if /^\s*$/;	2053	next if /^\s*$/;
1380		2054
1381	my ($file, $volume, $event) = split /\s+/, $_, 3;	2055	my ($file, $volume, $event) = split /\s+/, $_, 3;
1382		2056
1383	push @SOUNDS, "$volume,$file";	2057	push @SOUNDS, "$volume,$file";
1384		2058
1385	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2059	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1386	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2060	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1387	$chunk->volume ($volume * 128 / 100);	2061	$chunk->volume ($volume * 128 / 100);
1388	$chunk	2062	$chunk
1389	};	2063	};
1390	}	2064	}
1391	} else {	2065	} else {
…		…
1393	}	2067	}
1394	}	2068	}
1395	}	2069	}
1396		2070
1397	sub audio_shutdown {	2071	sub audio_shutdown {
1398	CFClient::Mix_CloseAudio if $SDL_MIXER;	2072	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1399	undef $SDL_MIXER;	2073	undef $SDL_MIXER;
1400	@SOUNDS = ();	2074	@SOUNDS = ();
1401	%AUDIO_CHUNKS = ();	2075	%AUDIO_CHUNKS = ();
1402	}	2076	}
1403		2077
…		…
1410		2084
1411	sub force_refresh {	2085	sub force_refresh {
1412	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2086	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1413	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2087	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1414		2088
1415	$CFClient::UI::ROOT->draw;	2089	$CFPlus::UI::ROOT->draw;
1416		2090
1417	$WANT_REFRESH = 0;	2091	$WANT_REFRESH = 0;
1418	$CAN_REFRESH = 0;	2092	$CAN_REFRESH = 0;
1419	$LAST_REFRESH = $NOW;	2093	$LAST_REFRESH = $NOW;
1420		2094
1421	0 && do {
1422	# some weird model-drawing code, just a joke right now
1423	use CFClient::OpenGL;
1424
1425	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1426	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1427	$demo{r} ||= do {
1428	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1429	$mod->{v} = pack "f*", @{$mod->{v}};
1430	$_ = [scalar @$_, pack "S!*", @$_]
1431	for values %{$mod->{g}};
1432	$mod
1433	};
1434
1435	my $r = $demo{r} or die;
1436
1437	glDepthMask 1;
1438	glClear GL_DEPTH_BUFFER_BIT;
1439	glEnable GL_TEXTURE_2D;
1440	glEnable GL_DEPTH_TEST;
1441	glEnable GL_CULL_FACE;
1442	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1443
1444	glMatrixMode GL_PROJECTION;
1445	glLoadIdentity;
1446	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1447	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1448	glMatrixMode GL_MODELVIEW;
1449	glLoadIdentity;
1450
1451	glPushMatrix;
1452	glTranslate 0, 0, -800;
1453	glScale 1, -1, 1;
1454	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1455	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1456	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1457	glScale 50, 50, 50;
1458
1459	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1460	while (my ($k, $v) = each %{$r->{g}}) {
1461	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1462	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1463	}
1464
1465	glPopMatrix;
1466
1467	glShadeModel GL_FLAT;
1468	glDisable GL_DEPTH_TEST;
1469	glDisable GL_TEXTURE_2D;
1470	glDepthMask 0;
1471
1472	$WANT_REFRESH++;
1473	};
1474
1475	CFClient::SDL_GL_SwapBuffers;	2095	CFPlus::SDL_GL_SwapBuffers;
1476	}	2096	}
1477		2097
1478	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2098	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1479	$NOW = time;	2099	$NOW = time;
1480		2100
1481	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2101	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1482	for CFClient::SDL_PollEvent;	2102	for CFPlus::SDL_PollEvent;
1483		2103
1484	if (%animate_object) {	2104	if (%animate_object) {
1485	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2105	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1486	$WANT_REFRESH++;	2106	$WANT_REFRESH++;
1487	}	2107	}
…		…
1511	$CONN->face_prefetch	2131	$CONN->face_prefetch
1512	if $CONN;	2132	if $CONN;
1513	});	2133	});
1514		2134
1515	%SDL_CB = (	2135	%SDL_CB = (
1516	CFClient::SDL_QUIT => sub {	2136	CFPlus::SDL_QUIT => sub {
1517	Event::unloop -1;	2137	Event::unloop -1;
1518	},	2138	},
1519	CFClient::SDL_VIDEORESIZE => sub {	2139	CFPlus::SDL_VIDEORESIZE => sub {
1520	},	2140	},
1521	CFClient::SDL_VIDEOEXPOSE => sub {	2141	CFPlus::SDL_VIDEOEXPOSE => sub {
1522	CFClient::UI::full_refresh;	2142	CFPlus::UI::full_refresh;
1523	},	2143	},
1524	CFClient::SDL_ACTIVEEVENT => sub {	2144	CFPlus::SDL_ACTIVEEVENT => sub {
1525	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2145	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1526	},	2146	},
1527	CFClient::SDL_KEYDOWN => sub {	2147	CFPlus::SDL_KEYDOWN => sub {
1528	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2148	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1529	# alt-enter	2149	# alt-enter
		2150	$FULLSCREEN_ENABLE->toggle;
1530	video_shutdown;	2151	video_shutdown;
1531	$CFG->{fullscreen} = !$CFG->{fullscreen};
1532	video_init;	2152	video_init;
1533	} else {	2153	} else {
1534	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2154	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1535	}	2155	}
1536	},	2156	},
1537	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2157	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1538	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2158	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1539	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2159	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1540	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2160	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1541	CFClient::SDL_USEREVENT => sub {	2161	CFPlus::SDL_USEREVENT => sub {
1542	if ($_[0]{code} == 1) {	2162	if ($_[0]{code} == 1) {
1543	audio_channel_finished $_[0]{data1};	2163	audio_channel_finished $_[0]{data1};
1544	} elsif ($_[0]{code} == 0) {	2164	} elsif ($_[0]{code} == 0) {
1545	audio_music_finished;	2165	audio_music_finished;
1546	}	2166	}
…		…
1550	#############################################################################	2170	#############################################################################
1551		2171
1552	$SIG{INT} = $SIG{TERM} = sub { exit };	2172	$SIG{INT} = $SIG{TERM} = sub { exit };
1553		2173
1554	{	2174	{
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	};
1560
1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2175	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562	CFClient::UI::set_layout ($::CFG->{layout});	2176	CFPlus::UI::set_layout ($::CFG->{layout});
1563		2177
1564	my %DEF_CFG = (	2178	my %DEF_CFG = (
1565	sdl_mode => 0,	2179	sdl_mode => 0,
1566	width => 640,	2180	width => 640,
1567	height => 480,	2181	height => 480,
1568	fullscreen => 0,	2182	fullscreen => 0,
1569	fast => 0,	2183	fast => 0,
1570	map_scale => 1,	2184	map_scale => 1,
1571	fow_enable => 1,	2185	fow_enable => 1,
1572	fow_intensity => 0.45,	2186	fow_intensity => 0.45,
1573	fow_smooth => 0,	2187	fow_smooth => 0,
1574	gui_fontsize => 1,	2188	gui_fontsize => 1,
1575	log_fontsize => 1,	2189	log_fontsize => 0.7,
1576	gauge_fontsize=> 1,	2190	gauge_fontsize => 1,
1577	gauge_size => 0.35,	2191	gauge_size => 0.35,
1578	stat_fontsize => 1,	2192	stat_fontsize => 0.7,
1579	mapsize => 100,	2193	mapsize => 100,
1580	host => "crossfire.schmorp.de",
1581	say_command => 'say',	2194	say_command => 'chat',
1582	audio_enable => 1,	2195	audio_enable => 1,
1583	bgm_enable => 1,	2196	bgm_enable => 1,
1584	bgm_volume => 0.25,	2197	bgm_volume => 0.25,
1585	face_prefetch => 0,	2198	face_prefetch => 0,
1586	output_sync => 1,	2199	output_sync => 1,
1587	output_count => 1,	2200	output_count => 1,
		2201	pickup => 0,
		2202	inv_sort => "mtime",
		2203	default => "profile", # default profile
		2204	show_tips => 1,
		2205	);
1588	);	2206
1589
1590	while (my ($k, $v) = each %DEF_CFG) {	2207	while (my ($k, $v) = each %DEF_CFG) {
1591	$CFG->{$k} = $v unless exists $CFG->{$k};	2208	$CFG->{$k} = $v unless exists $CFG->{$k};
1592	}	2209	}
1593		2210
		2211	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2212
1594	sdl_init;	2213	sdl_init;
1595		2214
1596	@SDL_MODES = reverse	2215	@SDL_MODES = reverse
1597	grep $_->[0] >= 640 && $_->[1] >= 480,	2216	grep $_->[0] >= 640 && $_->[1] >= 480,
1598	CFClient::SDL_ListModes;	2217	CFPlus::SDL_ListModes;
1599		2218
1600	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2219	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1601		2220
1602	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2221	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1603		2222
1604	{	2223	{
1605	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2224	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1606	DejaVuSans.ttf	2225	DejaVuSans.ttf
1607	DejaVuSansMono.ttf	2226	DejaVuSansMono.ttf
1608	DejaVuSans-Bold.ttf	2227	DejaVuSans-Bold.ttf
1609	DejaVuSansMono-Bold.ttf	2228	DejaVuSansMono-Bold.ttf
1610	DejaVuSans-Oblique.ttf	2229	DejaVuSans-Oblique.ttf
1611	DejaVuSansMono-Oblique.ttf	2230	DejaVuSansMono-Oblique.ttf
1612	DejaVuSans-BoldOblique.ttf	2231	DejaVuSans-BoldOblique.ttf
1613	DejaVuSansMono-BoldOblique.ttf	2232	DejaVuSansMono-BoldOblique.ttf
1614	);	2233	);
1615		2234
1616	CFClient::add_font $_ for @fonts;	2235	CFPlus::add_font $_ for @fonts;
1617		2236
1618	CFClient::pango_init;	2237	CFPlus::pango_init;
1619		2238
1620	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2239	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1621	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2240	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1622		2241
1623	$FONT_PROP->make_default;	2242	$FONT_PROP->make_default;
1624	}	2243	}
1625		2244
1626	# compare mono (ft) vs. rgba (cairo)	2245	# compare mono (ft) vs. rgba (cairo)
1627	# ft - 1.8s, cairo 3s, even in alpha-only mode	2246	# ft - 1.8s, cairo 3s, even in alpha-only mode
1628	# for my $rgba (0..1) {	2247	# for my $rgba (0..1) {
1629	# my $t1 = Time::HiRes::time;	2248	# my $t1 = Time::HiRes::time;
1630	# for (1..1000) {	2249	# for (1..1000) {
1631	# my $layout = CFClient::Layout->new ($rgba);	2250	# my $layout = CFPlus::Layout->new ($rgba);
1632	# $layout->set_text ("hallo" x 100);	2251	# $layout->set_text ("hallo" x 100);
1633	# $layout->render;	2252	# $layout->render;
1634	# }	2253	# }
1635	# my $t2 = Time::HiRes::time;	2254	# my $t2 = Time::HiRes::time;
1636	# warn $t2-$t1;	2255	# warn $t2-$t1;
1637	# }	2256	# }
1638		2257
		2258	$startup_done->();
		2259
1639	video_init;	2260	video_init;
1640	audio_init;	2261	audio_init;
1641	}	2262	}
1642		2263
		2264	show_tip_of_the_day if $CFG->{show_tips};
		2265
1643	Event::loop;	2266	Event::loop;
		2267	#CFPlus::SDL_Quit;
		2268	#CFPlus::_exit 0;
1644		2269
1645	END { CFClient::SDL_Quit }	2270	END { CFPlus::SDL_Quit }
1646		2271
1647	=head1 NAME	2272	=head1 NAME
1648		2273
1649	cfplus - A Crossfire+ and Crossfire game client	2274	cfplus - A Crossfire+ and Crossfire game client
1650		2275

Diff Legend

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