ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.138 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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