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.86 by root, Sun Jul 2 21:07:27 2006 UTC vs.
Revision 1.139 by root, Sat Dec 9 22:06:51 2006 UTC

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

Diff Legend

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