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.132 by root, Mon Nov 20 16:41:46 2006 UTC

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

Diff Legend

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