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

Diff Legend

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