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

Diff Legend

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