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

Diff Legend

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