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

Diff Legend

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