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

Diff Legend

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