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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.139 by root, Sat Dec 9 22:06:51 2006 UTC

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

Diff Legend

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