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

Diff Legend

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