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.88 by root, Mon Jul 3 22:04:25 2006 UTC vs.
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC

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

Diff Legend

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