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.73 by root, Sat Jun 17 15:07:54 2006 UTC vs.
Revision 1.113 by root, Sun Aug 13 21:46:10 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;
		42	use CFPlus::BindingEditor;
41	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
42		44
43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		46	$SIG{PIPE} = 'IGNORE';
44		47
		48	$Event::Eval = 0;
45	$Event::DIED = sub {	49	$Event::DIED = sub {
46	# TODO: display dialog box or so	50	# TODO: display dialog box or so
47	Carp::confess $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
48	CFClient::error $_[1];	52	CFPlus::error $_[1];
49	};	53	};
50		54
51	#$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	};
52		63
53	our $VERSION = '0.1';	64	our $VERSION = '0.1';
54		65
55	my $MAX_FPS = 60;	66	my $MAX_FPS = 60;
56	my $MIN_FPS = 5; # unused as of yet	67	my $MIN_FPS = 5; # unused as of yet
…		…
84	our $CONSOLE;	95	our $CONSOLE;
85	our $METASERVER;	96	our $METASERVER;
86	our $LOGIN_BUTTON;	97	our $LOGIN_BUTTON;
87	our $QUIT_DIALOG;	98	our $QUIT_DIALOG;
88	our $HOST_ENTRY;	99	our $HOST_ENTRY;
		100	our $FULLSCREEN_ENABLE;
		101	our $PICKUP_ENABLE;
89	our $SERVER_INFO;	102	our $SERVER_INFO;
90		103
91	our $SETUP_DIALOG;	104	our $SETUP_DIALOG;
92	our $SETUP_NOTEBOOK;	105	our $SETUP_NOTEBOOK;
93	our $SETUP_SERVER;	106	our $SETUP_SERVER;
94	our $SETUP_KEYBOARD;	107	our $SETUP_KEYBOARD;
95	our $SETUP_SPELLS;
96		108
		109	our $PL_NOTEBOOK;
97	our $STATS_WINDOW;	110	our $PL_WINDOW;
		111
		112	our $INVENTORY_PAGE;
		113	our $STATS_PAGE;
		114	our $SKILL_PAGE;
		115	our $SPELL_PAGE;
		116
		117	our $HELP_WINDOW;
98	our $MESSAGE_WINDOW;	118	our $MESSAGE_WINDOW;
99	our $FLOORBOX;	119	our $FLOORBOX;
100	our $GAUGES;	120	our $GAUGES;
101	our $STATWIDS;	121	our $STATWIDS;
102		122
…		…
109		129
110	our $ALT_ENTER_MESSAGE;	130	our $ALT_ENTER_MESSAGE;
111	our $STATUSBOX;	131	our $STATUSBOX;
112	our $DEBUG_STATUS;	132	our $DEBUG_STATUS;
113		133
114	our $INV_WINDOW;
115	our $INV;	134	our $INV;
116	our $INVR;	135	our $INVR;
117	our $INV_RIGHT_HB;	136	our $INV_RIGHT_HB;
118		137
119	our $BIND_EDITOR;	138	our $BIND_EDITOR;
		139	our $BIND_UPD_CB;
120		140
121	our $PICKUP_CFG;	141	our $PICKUP_CFG;
122		142
123	sub status {	143	sub status {
124	$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]);
125	}	145	}
126		146
127	sub debug {	147	sub debug {
128	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
129	}	149	}
…		…
135		155
136	# server query dialog	156	# server query dialog
137	sub server_query {	157	sub server_query {
138	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
139		159
140	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
141	x => "center",	161	x => "center",
142	y => "center",	162	y => "center",
143	title => "Server Query",	163	title => "Server Query",
144	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
145	;	165	;
146		166
147	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
148	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
149	ellipsise => 0,	169	ellipsise => 0,
150	text => $prompt;	170	text => $prompt;
151		171
152	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
153	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
154		174
155	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
156	text => "No",	176	text => "No",
157	on_activate => sub {	177	on_activate => sub {
158	$conn->send ("reply n");	178	$conn->send ("reply n");
159	$dialog->destroy;	179	$dialog->destroy;
		180	0
160	}	181	}
161	);	182	);
162	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
163	text => "Yes",	184	text => "Yes",
164	on_activate => sub {	185	on_activate => sub {
165	$conn->send ("reply y");	186	$conn->send ("reply y");
166	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
		188	0
167	},	189	},
168	);	190	);
169		191
170	$dialog->focus_in;	192	$dialog->grab_focus;
171		193
172	} elsif ($flags & CS_QUERY_SINGLECHAR) {	194	} elsif ($flags & CS_QUERY_SINGLECHAR) {
173	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "#charcreation_focus";
174		196
175	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) {
176	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
177		199
178	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
179	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
180	ellipsise => 0,	202	ellipsise => 0,
181	markup => "\nOr use your keyboard:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
182		204
183	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
184		206
185	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
186	text => "Next Race",	208	text => "Next Race",
187	on_activate => sub {	209	on_activate => sub {
188	$conn->send ("reply n");	210	$conn->send ("reply n");
189	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
		212	0
190	},	213	},
191	);	214	);
192	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
193	text => "Accept",	216	text => "Accept",
194	on_activate => sub {	217	on_activate => sub {
195	$conn->send ("reply d");	218	$conn->send ("reply d");
196	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
		220	0
197	},	221	},
198	);	222	);
199		223
200	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
201	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
202	ellipsise => 0,	226	ellipsise => 0,
203	markup =>	227	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
204	"<big><b>Character Creation: Race</b></big>\n\n"
205	. "Look at the <b>Messages</b> window to see a description of this race "
206	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207	. "and the center of the screen to see how this race looks like "
208	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209	. "You can look at another race, or accept this race (you will come back to this race eventually, "
210	. "so you can take your time making this important choice."
211	;	228	;
212		229
213	} elsif ($prompt =~ /roll new stats/) {	230	} elsif ($prompt =~ /roll new stats/) {
214	if (my $stat = delete $conn->{stat_change_with}) {	231	if (my $stat = delete $conn->{stat_change_with}) {
215	$conn->send ("reply $stat");	232	$conn->send ("reply $stat");
216	destroy_query_dialog $conn;	233	destroy_query_dialog $conn;
217	return;	234	return;
218	}	235	}
219		236
220	$STATS_WINDOW->show;	237	$STATS_PAGE->show;
221	$MESSAGE_WINDOW->hide;	238	$MESSAGE_WINDOW->hide;
222		239
223	unshift @dialog, new CFClient::UI::Label	240	unshift @dialog, new CFPlus::UI::Label
224	max_w => $::WIDTH * 0.4,	241	max_w => $::WIDTH * 0.4,
225	ellipsise => 0,	242	ellipsise => 0,
226	markup => "\nOr use your keyboard:\n";	243	markup => "\nOr use your keyboard and the text entry below:\n";
227		244
228	unshift @dialog, my $table = new CFClient::UI::Table;	245	unshift @dialog, my $table = new CFPlus::UI::Table;
229		246
230	# left: re-roll	247	# left: re-roll
231	$table->add (0, 0, new CFClient::UI::Button	248	$table->add (0, 0, new CFPlus::UI::Button
232	text => "Roll Again",	249	text => "Roll Again",
233	on_activate => sub {	250	on_activate => sub {
234	$conn->send ("reply y");	251	$conn->send ("reply y");
235	destroy_query_dialog $conn;	252	destroy_query_dialog $conn;
		253	0
236	},	254	},
237	);	255	);
238		256
239	# center: swap stats	257	# center: swap stats
240	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	258	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		259	expand => 1,
241	value => $_,	260	value => $_,
242	options => [	261	options => [
243	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	262	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	263	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],	264	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
…		…
248	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	267	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	268	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250	],	269	],
251	), 1 .. 2;	270	), 1 .. 2;
252		271
253	$table->add (2, 0, new CFClient::UI::Button	272	$table->add (2, 0, new CFPlus::UI::Button
254	text => "Swap Stats",	273	text => "Swap Stats",
255	on_activate => sub {	274	on_activate => sub {
256	$conn->{stat_change_with} = $sw2->{value};	275	$conn->{stat_change_with} = $sw2->{value};
257	$conn->send ("reply $sw1->{value}");	276	$conn->send ("reply $sw1->{value}");
258	destroy_query_dialog $conn;	277	destroy_query_dialog $conn;
		278	0
259	},	279	},
260	);	280	);
261	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	281	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
262		282
263	# right: accept	283	# right: accept
264	$table->add (4, 0, new CFClient::UI::Button	284	$table->add (4, 0, new CFPlus::UI::Button
265	text => "Accept",	285	text => "Accept",
266	on_activate => sub {	286	on_activate => sub {
267	$conn->send ("reply n");	287	$conn->send ("reply n");
268	$STATS_WINDOW->hide;	288	$STATS_PAGE->hide;
269	destroy_query_dialog $conn;	289	destroy_query_dialog $conn;
		290	0
270	},	291	},
271	);	292	);
272		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
273	unshift @dialog, new CFClient::UI::Label	315	unshift @dialog, new CFPlus::UI::Label
274	max_w => $::WIDTH * 0.4,	316	max_w => $::WIDTH * 0.4,
275	ellipsise => 0,	317	ellipsise => 0,
276	markup =>	318	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
277	"<big><b>Character Creation: Stats</b></big>\n\n"
278	. "Look at the <b>Stats</b> window to see your basic stats "
279	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281	. "Race selection will influence those values later on."
282	;	319	;
283	}	320	}
284		321
285	push @dialog, my $entry = new CFClient::UI::Entry	322	push @dialog, my $entry = new CFPlus::UI::Entry
286	on_changed => sub {	323	on_changed => sub {
287	$conn->send ("reply $_[1]");	324	$conn->send ("reply $_[1]");
288	destroy_query_dialog $conn;	325	destroy_query_dialog $conn;
		326	0
289	},	327	},
290	;	328	;
291		329
292	$entry->focus_in;	330	$entry->grab_focus;
293		331
294	} else {	332	} else {
295	$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)";
296		334
297	push @dialog, my $entry = new CFClient::UI::Entry	335	push @dialog, my $entry = new CFPlus::UI::Entry
298	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	336	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299	on_activate => sub {	337	on_activate => sub {
300	$conn->send ("reply $_[1]");	338	$conn->send ("reply $_[1]");
301	destroy_query_dialog $conn;	339	destroy_query_dialog $conn;
		340	0
302	},	341	},
303	;	342	;
304		343
305	$entry->focus_in;	344	$entry->grab_focus;
306	}	345	}
307		346
308	$vbox->add (@dialog);	347	$vbox->add (@dialog);
309	$dialog->show;	348	$dialog->show;
310	}	349	}
…		…
315	$LOGIN_BUTTON->set_text ("Logout");	354	$LOGIN_BUTTON->set_text ("Logout");
316	$SETUP_DIALOG->hide;	355	$SETUP_DIALOG->hide;
317		356
318	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;
319		358
320	my ($host, $port) = split /:/, $CFG->{host};	359	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321		360
322	$MAP = new CFClient::Map $mapsize, $mapsize;	361	$MAP = new CFPlus::Map $mapsize, $mapsize;
323		362
324	$CONN = eval {	363	$CONN = eval {
325	new CFClient::Protocol	364	new CFPlus::Protocol
326	host => $host,	365	host => $host,
327	port => $port || 13327,	366	port => $port || 13327,
328	user => $CFG->{user},	367	user => $CFG->{profile}{default}{user},
329	pass => $CFG->{password},	368	pass => $CFG->{profile}{default}{password},
330	mapw => $mapsize,	369	mapw => $mapsize,
331	maph => $mapsize,	370	maph => $mapsize,
332		371
333	map_widget => $MAPWIDGET,	372	map_widget => $MAPWIDGET,
334	logview => $LOGVIEW,	373	logview => $LOGVIEW,
…		…
349	$chunk->play;	388	$chunk->play;
350	},	389	},
351	};	390	};
352		391
353	if ($CONN) {	392	if ($CONN) {
354	CFClient::lowdelay fileno $CONN->{fh};	393	CFPlus::lowdelay fileno $CONN->{fh};
355		394
356	status "login successful";	395	status "login successful";
357	} else {	396	} else {
358	status "unable to connect";	397	status "unable to connect";
359	stop_game();	398	stop_game();
…		…
362		401
363	sub stop_game {	402	sub stop_game {
364	$LOGIN_BUTTON->set_text ("Login");	403	$LOGIN_BUTTON->set_text ("Login");
365	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	404	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366	$SETUP_DIALOG->show;	405	$SETUP_DIALOG->show;
367	$INV_WINDOW->hide;	406	$PL_WINDOW->hide;
368	$SETUP_SPELLS->clear_spells;	407	$SPELL_PAGE->clear_spells;
369		408
370	return unless $CONN;	409	return unless $CONN;
371		410
372	status "connection closed";	411	status "connection closed";
373		412
374	destroy_query_dialog $CONN;	413	destroy_query_dialog $CONN;
375	$CONN->destroy;	414	$CONN->destroy;
376	$CONN = 0; # false, does not autovivify	415	$CONN = 0; # false, does not autovivify
		416
		417	undef $MAP;
377	}	418	}
378		419
379	sub graphics_setup {	420	sub graphics_setup {
380	my $vbox = new CFClient::UI::VBox;	421	my $vbox = new CFPlus::UI::VBox;
381		422
382	$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]);
383		424
384	$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");
385	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	426	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
386		427
387	$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]);
388	$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");
389		430
390	$mode_slider->connect (changed => sub {	431	$mode_slider->connect (changed => sub {
391	my ($self, $value) = @_;	432	my ($self, $value) = @_;
392		433
393	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	434	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
395	});	436	});
396	$mode_slider->emit (changed => $mode_slider->{range}[0]);	437	$mode_slider->emit (changed => $mode_slider->{range}[0]);
397		438
398	my $row = 1;	439	my $row = 1;
399		440
400	$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");
401	$table->add (1, $row++, new CFClient::UI::CheckBox	442	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
402	state => $CFG->{fullscreen},	443	state => $CFG->{fullscreen},
403	tooltip => "Bring the client into fullscreen mode.",	444	tooltip => "Bring the client into fullscreen mode.",
404	on_changed => sub {	445	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405	my ($self, $value) = @_;
406	$CFG->{fullscreen} = $value;
407	}
408	);	446	);
409		447
410	$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");
411	$table->add (1, $row++, new CFClient::UI::CheckBox	449	$table->add (1, $row++, new CFPlus::UI::CheckBox
412	state => $CFG->{fast},	450	state => $CFG->{fast},
413	tooltip => "Lower the visual quality considerably to speed up rendering.",	451	tooltip => "Lower the visual quality considerably to speed up rendering.",
414	on_changed => sub {	452	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415	my ($self, $value) = @_;
416	$CFG->{fast} = $value;
417	}
418	);	453	);
419		454
420	$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");
421	$table->add (1, $row++, new CFClient::UI::Slider	456	$table->add (1, $row++, new CFPlus::UI::Slider
422	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	457	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	458	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424	on_changed => sub {	459	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425	my ($self, $value) = @_;
426	$CFG->{map_scale} = 2 ** $value;
427	}
428	);	460	);
429		461
430	$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");
431	$table->add (1, $row++, new CFClient::UI::CheckBox	463	$table->add (1, $row++, new CFPlus::UI::CheckBox
432	state => $CFG->{fow_enable},	464	state => $CFG->{fow_enable},
433	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.",
434	on_changed => sub {	466	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435	my ($self, $value) = @_;
436	$CFG->{fow_enable} = $value;
437	}
438	);	467	);
439		468
440	$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");
441	$table->add (1, $row++, new CFClient::UI::Slider	470	$table->add (1, $row++, new CFPlus::UI::Slider
442	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	471	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	472	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
444	on_changed => sub {	473	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445	my ($self, $value) = @_;
446	$CFG->{fow_intensity} = $value;
447	}
448	);	474	);
449		475
450	$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");
451	$table->add (1, $row++, new CFClient::UI::CheckBox	477	$table->add (1, $row++, new CFPlus::UI::CheckBox
452	state => $CFG->{fow_smooth},	478	state => $CFG->{fow_smooth},
453	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.",
454	on_changed => sub {	480	on_changed => sub {
455	my ($self, $value) = @_;	481	my ($self, $value) = @_;
456	$CFG->{fow_smooth} = $value;	482	$CFG->{fow_smooth} = $value;
457	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;
		484	0
458	}	485	}
459	);	486	);
460		487
461	$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");
462	$table->add (1, $row++, new CFClient::UI::Slider	489	$table->add (1, $row++, new CFPlus::UI::Slider
463	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	490	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464	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.",
465	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	492	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466	);	493	);
467		494
468	$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");
469	$table->add (1, $row++, new CFClient::UI::Slider	496	$table->add (1, $row++, new CFPlus::UI::Slider
470	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	497	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471	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.",
472	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	499	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473	);	500	);
474		501
475	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476
477	$table->add (1, $row++, new CFClient::UI::Slider
478	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480	on_changed => sub {
481	$CFG->{stat_fontsize} = $_[1];
482	&set_stats_window_fontsize;
483	}
484	);
485
486	$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");
487	$table->add (1, $row++, new CFClient::UI::Slider	503	$table->add (1, $row++, new CFPlus::UI::Slider
488	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	504	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489	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.",
490	on_changed => sub {	506	on_changed => sub {
491	$CFG->{gauge_fontsize} = $_[1];	507	$CFG->{gauge_fontsize} = $_[1];
492	&set_gauge_window_fontsize;	508	&set_gauge_window_fontsize;
		509	0
493	}	510	}
494	);	511	);
495		512
496	$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");
497	$table->add (1, $row++, new CFClient::UI::Slider	514	$table->add (1, $row++, new CFPlus::UI::Slider
498	range => [$CFG->{gauge_size}, 0.2, 0.8],	515	range => [$CFG->{gauge_size}, 0.2, 0.8],
499	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.",
500	on_changed => sub {	517	on_changed => sub {
501	$CFG->{gauge_size} = $_[1];	518	$CFG->{gauge_size} = $_[1];
502	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	519	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		520	0
503	}	521	}
504	);	522	);
505		523
506	$table->add (1, $row++, new CFClient::UI::Button	524	$table->add (1, $row++, new CFPlus::UI::Button
507	expand => 1, align => 0, text => "Apply",	525	expand => 1, align => 0, text => "Apply",
508	tooltip => "Apply the video settings",	526	tooltip => "Apply the video settings",
509	on_activate => sub {	527	on_activate => sub {
510	video_shutdown ();	528	video_shutdown ();
511	video_init ();	529	video_init ();
		530	0
512	}	531	}
513	);	532	);
514		533
515	$vbox	534	$vbox
516	}	535	}
517		536
518	sub audio_setup {	537	sub audio_setup {
519	my $vbox = new CFClient::UI::VBox;	538	my $vbox = new CFPlus::UI::VBox;
520		539
521	$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]);
522		541
523	my $row = 0;	542	my $row = 0;
524		543
525	$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");
526	$table->add (1, $row++, new CFClient::UI::CheckBox	545	$table->add (1, $row++, new CFPlus::UI::CheckBox
527	state => $CFG->{audio_enable},	546	state => $CFG->{audio_enable},
528	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.",
529	on_changed => sub {	548	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530	$CFG->{audio_enable} = $_[1];
531	}
532	);	549	);
533	# $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");
534	# $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 {
535	# $CFG->{effects_volume} = $_[1];	552	# $CFG->{effects_volume} = $_[1];
536	# });	553	# });
537	$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");
538	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	555	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
539	$hbox->add (new CFClient::UI::CheckBox	556	$hbox->add (new CFPlus::UI::CheckBox
540	expand => 1, state => $CFG->{bgm_enable},	557	expand => 1, state => $CFG->{bgm_enable},
541	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.",
542	on_changed => sub {	559	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543	$CFG->{bgm_enable} = $_[1];
544	}
545	);	560	);
546	$hbox->add (new CFClient::UI::Slider	561	$hbox->add (new CFPlus::UI::Slider
547	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	562	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548	tooltip => "The volume of the background music. Changes are instant.",	563	tooltip => "The volume of the background music. Changes are instant.",
549	on_changed => sub {	564	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
550	$CFG->{bgm_volume} = $_[1];
551	CFClient::MixMusic::volume $_[1] * 128;
552	}
553	);	565	);
554		566
555	$table->add (1, $row++, new CFClient::UI::Button	567	$table->add (1, $row++, new CFPlus::UI::Button
556	expand => 1, align => 0, text => "Apply",	568	expand => 1, align => 0, text => "Apply",
557	tooltip => "Apply the audio settings",	569	tooltip => "Apply the audio settings",
558	on_activate => sub {	570	on_activate => sub {
559	audio_shutdown ();	571	audio_shutdown ();
560	audio_init ();	572	audio_init ();
		573	0
561	}	574	}
562	);	575	);
563		576
564	$vbox	577	$vbox
565	}
566
567	sub set_stats_window_fontsize {
568	for (values %{$STATWIDS}) {
569	$_->set_fontsize ($::CFG->{stat_fontsize});
570	}
571	}	578	}
572		579
573	sub set_gauge_window_fontsize {	580	sub set_gauge_window_fontsize {
574	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	581	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575	$_->set_fontsize ($::CFG->{gauge_fontsize});	582	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
577	}	584	}
578		585
579	sub make_gauge_window {	586	sub make_gauge_window {
580	my $gh = int $HEIGHT * $CFG->{gauge_size};	587	my $gh = int $HEIGHT * $CFG->{gauge_size};
581		588
582	my $win = new CFClient::UI::Frame (	589	my $win = new CFPlus::UI::Frame (
583	force_x => 0,	590	force_x => 0,
584	force_y => "max",	591	force_y => "max",
585	force_w => $WIDTH,	592	force_w => $WIDTH,
586	force_h => $gh,	593	force_h => $gh,
587	);	594	);
588		595
589	$win->add (my $hbox = new CFClient::UI::HBox	596	$win->add (my $hbox = new CFPlus::UI::HBox
590	children => [	597	children => [
591	(new CFClient::UI::HBox expand => 1),	598	(new CFPlus::UI::HBox expand => 1),
592	(new CFClient::UI::VBox children => [	599	(new CFPlus::UI::VBox children => [
593	(new CFClient::UI::Empty expand => 1),	600	(new CFPlus::UI::Empty expand => 1),
594	(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)),
595	]),	602	]),
596	(my $vbox = new CFClient::UI::VBox),	603	(my $vbox = new CFPlus::UI::VBox),
597	],	604	],
598	);	605	);
599		606
600	$vbox->add (new CFClient::UI::HBox	607	$vbox->add (new CFPlus::UI::HBox
601	expand => 1,	608	expand => 1,
602	children => [	609	children => [
603	(new CFClient::UI::Empty expand => 1),	610	(new CFPlus::UI::Empty expand => 1),
604	(my $hb = new CFClient::UI::HBox),	611	(my $hb = new CFPlus::UI::HBox),
605	],	612	],
606	);	613	);
607		614
608	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	615	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
609	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.");
610	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	616	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
611	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.");
612	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	617	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
613	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.");
614	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	618	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
615	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.");
616		619
617	$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");
618	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.");
619	$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");
620	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
621		622
622	$GAUGES = {	623	$GAUGES = {
623	exp => $exp, win => $win, range => $rng,	624	exp => $exp, win => $win, range => $rng,
624	food => $fg, mana => $mg, hp => $hg, grace => $gg	625	food => $fg, mana => $mg, hp => $hg, grace => $gg
625	};	626	};
…		…
628		629
629	$win	630	$win
630	}	631	}
631		632
632	sub debug_setup {	633	sub debug_setup {
633	my $table = new CFClient::UI::Table;	634	my $table = new CFPlus::UI::Table;
634		635
635	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	636	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
636	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });	637	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
637	$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");
638	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });	639	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
639	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	640	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
640	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });	641	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
641	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	642	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
642	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });	643	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643		644
644	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);
645		646
646	for my $x (0..2) {	647	for my $x (0..2) {
647	for my $y (0 .. 2) {	648	for my $y (0 .. 2) {
648	$table->add ($x + 3, $y,	649	$table->add ($x + 3, $y,
649	new CFClient::UI::Entry	650	new CFPlus::UI::Entry
650	text => $default_smooth[$x * 3 + $y],	651	text => $default_smooth[$x * 3 + $y],
651	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 },
652	);	653	);
653	}	654	}
654	}	655	}
…		…
656		657
657	$table	658	$table
658	}	659	}
659		660
660	sub stats_window {	661	sub stats_window {
661	my $tgw = new CFClient::UI::FancyFrame	662	my $r = new CFPlus::UI::ScrolledWindow (
662	y => $HEIGHT * (2/8),	663	expand => 1,
663	x => "max",	664	scroll_y => 1
664	title => "Stats",	665	);
665	name => "stats_window";	666	$r->add (my $vb = new CFPlus::UI::VBox);
666		667
667	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
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."],	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)"],
730	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	742	phys => ["Physical",
		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	image => "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_ARMOUR});
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 {
		812	my ($metaserver_dialog) = @_;
		813
		814	$METASERVER = $metaserver_dialog
		815	if defined $metaserver_dialog;
		816
849	return if $METASERVER_ATIME > time;	817	return if $METASERVER_ATIME > time;
850	$METASERVER_ATIME = time + 60;	818	$METASERVER_ATIME = time + 60;
851		819
852	my $table = $METASERVER->{table};	820	my $table = $METASERVER->{table};
853	$table->clear;	821	$table->clear;
854	$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...");
855		823
856	my $buf;	824	my $buf;
857		825
858	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	826	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
859		827
…		…
882	"The time this server has been running without being restarted.",	850	"The time this server has been running without being restarted.",
883	"The server software version - a '+' indicates a Crossfire+ server.",	851	"The server software version - a '+' indicates a Crossfire+ server.",
884	"Short information about this server provided by its admins.",	852	"Short information about this server provided by its admins.",
885	);	853	);
886	my @col = qw(#Users Host Uptime Version Description);	854	my @col = qw(#Users Host Uptime Version Description);
887	$table->add ($_, 0, new CFClient::UI::Label	855	$table->add ($_, 0, new CFPlus::UI::Label
888	can_hover => 1, can_events => 1,	856	can_hover => 1, can_events => 1,
889	align => 0, fg => [1, 1, 0],	857	align => 0, fg => [1, 1, 0],
890	text => $col[$_], tooltip => $tip[$_])	858	text => $col[$_], tooltip => $tip[$_])
891	for 0 .. $#col;	859	for 0 .. $#col;
892		860
…		…
913		881
914	$m = [$users, $host, $uptime, $version, $desc];	882	$m = [$users, $host, $uptime, $version, $desc];
915		883
916	$y++;	884	$y++;
917		885
918	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	886	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
919	(new CFClient::UI::Button	887	(new CFPlus::UI::Button
920	text => "Use",	888	text => "Use",
921	tooltip => "Put this server into the <b>Host:Port</b> field",	889	tooltip => "Put this server into the <b>Host:Port</b> field",
922	on_activate => sub {	890	on_activate => sub {
923	$HOST_ENTRY->set_text ($CFG->{host} = $host);	891	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924	$METASERVER->hide;	892	$METASERVER->hide;
		893	0
925	},	894	},
926	),	895	),
927	(new CFClient::UI::Empty expand => 1),	896	(new CFPlus::UI::Empty expand => 1),
928	]);	897	]);
929		898
930	$table->add ($_, $y, new CFClient::UI::Label	899	$table->add ($_, $y, new CFPlus::UI::Label
931	ellipsise => 0,	900	ellipsise => 0,
932	align => $align[$_],	901	align => $align[$_],
933	text => $m->[$_],	902	text => $m->[$_],
934	tooltip => $tip[$_],	903	tooltip => $tip[$_],
935	can_hover => 1,	904	can_hover => 1,
…		…
940	}	909	}
941	});	910	});
942	}	911	}
943		912
944	sub metaserver_dialog {	913	sub metaserver_dialog {
		914	my $vbox = new CFPlus::UI::VBox;
		915	my $table = new CFPlus::UI::Table;
		916	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		917
945	my $dialog = new CFClient::UI::FancyFrame	918	my $dialog = new CFPlus::UI::FancyFrame
946	title => "Server List",	919	title => "Server List",
947	name => 'metaserver_dialog',	920	name => 'metaserver_dialog',
948	x => 'center',	921	x => 'center',
949	y => 'center',	922	y => 'center',
950	z => 3,	923	z => 3,
951	force_h => $::HEIGHT * 0.4,	924	force_h => $::HEIGHT * 0.4,
952	child => (my $vbox = new CFClient::UI::VBox),	925	child => $vbox,
		926	has_close_button => 1,
		927	table => $table,
953	on_visibility_change => sub {	928	on_visibility_change => sub {
954	update_metaserver if $_[1];	929	update_metaserver ($_[0]) if $_[1];
		930	0
955	},	931	},
956	;	932	;
957		933
958	$dialog->{table} = new CFClient::UI::Table;
959
960	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962	$dialog	934	$dialog
963	}	935	}
964		936
965	sub server_setup {	937	sub server_setup {
966	my $vbox = new CFClient::UI::VBox;	938	my $vbox = new CFPlus::UI::VBox;
967		939
968	$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]);
969	$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");
970		942
971	{	943	{
972	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	944	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
973		945
974	$vbox->add (	946	$vbox->add (
975	$HOST_ENTRY = new CFClient::UI::Entry	947	$HOST_ENTRY = new CFPlus::UI::Entry
976	expand => 1,	948	expand => 1,
977	text => $CFG->{host},	949	text => $CFG->{profile}{default}{host},
978	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",
979	on_changed => sub {	951	on_changed => sub {
980	my ($self, $value) = @_;	952	my ($self, $value) = @_;
981	$CFG->{host} = $value;	953	$CFG->{profile}{default}{host} = $value;
		954	0
982	}	955	}
983	);	956	);
984		957
985	$METASERVER = metaserver_dialog;
986
987	$vbox->add (new CFClient::UI::Button	958	$vbox->add (new CFPlus::UI::Button
988	expand => 1,	959	expand => 1,
989	text => "Server List",	960	text => "Server List",
990	other => $METASERVER,	961	other => $METASERVER,
991	tooltip => "Show a list of available crossfire servers",	962	tooltip => "Show a list of available crossfire servers",
992	on_activate => sub { $METASERVER->toggle_visibility },	963	on_activate => sub { $METASERVER->toggle_visibility; 0 },
993	on_visibility_change => sub { $METASERVER->hide unless $_[1] },	964	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994	);	965	);
995	}	966	}
996		967
997	$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");
998	$table->add (1, 4, new CFClient::UI::Entry	969	$table->add (1, 4, new CFPlus::UI::Entry
999	text => $CFG->{user},	970	text => $CFG->{profile}{default}{user},
1000	tooltip => "The name of your character on the server",	971	tooltip => "The name of your character on the server",
1001	on_changed => sub {	972	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002	my ($self, $value) = @_;
1003	$CFG->{user} = $value;
1004	}
1005	);	973	);
1006		974
1007	$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");
1008	$table->add (1, 5, new CFClient::UI::Entry	976	$table->add (1, 5, new CFPlus::UI::Entry
1009	text => $CFG->{password},	977	text => $CFG->{profile}{default}{password},
1010	hidden => 1,	978	hidden => 1,
1011	tooltip => "The password for your character",	979	tooltip => "The password for your character",
1012	on_changed => sub {	980	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013	my ($self, $value) = @_;
1014	$CFG->{password} = $value;
1015	}
1016	);	981	);
1017		982
1018	$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");
1019	$table->add (1, 7, new CFClient::UI::Slider	984	$table->add (1, 7, new CFPlus::UI::Slider
1020	force_w => 100,	985	force_w => 100,
1021	range => [$CFG->{mapsize}, 10, 100, 0, 1],	986	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022	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. "
1023	. "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, "
1024	. "but you also increase bandwidth requirements and latency. "	989	. "but you also increase bandwidth requirements and latency. "
1025	. "This option is only used once at log-in.",	990	. "This option is only used once at log-in.",
1026	on_changed => sub {	991	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027	my ($self, $value) = @_;
1028
1029	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030	},
1031	);	992	);
1032		993
1033	$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");
1034	$table->add (1, 8, new CFClient::UI::CheckBox	995	$table->add (1, 8, new CFPlus::UI::CheckBox
1035	state => $CFG->{face_prefetch},	996	state => $CFG->{face_prefetch},
1036	tooltip => "<b>Background Image Prefetch</b>\n\n"	997	tooltip => "<b>Background Image Prefetch</b>\n\n"
1037	. "If enabled, the client automatically pre-fetches images from the server. "	998	. "If enabled, the client automatically pre-fetches images from the server. "
1038	. "This might increase or create lag, but increases the chances "	999	. "This might increase or create lag, but increases the chances "
1039	. "of faces being ready for display when you encounter them. "	1000	. "of faces being ready for display when you encounter them. "
1040	. "It also uses up server bandwidth on every connect, "	1001	. "It also uses up server bandwidth on every connect, "
1041	. "so only set it if you really need to prefetch images. "	1002	. "so only set it if you really need to prefetch images. "
1042	. "This option can be set and unset any time.",	1003	. "This option can be set and unset any time.",
1043	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1004	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044	);	1005	);
1045		1006
1046	$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");
1047	$table->add (1, 9, new CFClient::UI::Entry	1008	$table->add (1, 9, new CFPlus::UI::Entry
1048	text => $CFG->{output_count},	1009	text => $CFG->{output_count},
1049	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.",
1050	on_changed => sub { $CFG->{output_count} = $_[1] },	1011	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051	);	1012	);
1052		1013
1053	$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");
1054	$table->add (1, 10, new CFClient::UI::Entry	1015	$table->add (1, 10, new CFPlus::UI::Entry
1055	text => $CFG->{output_sync},	1016	text => $CFG->{output_sync},
1056	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.",
1057	on_changed => sub { $CFG->{output_sync} = $_[1] },	1018	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058	);	1019	);
1059		1020
1060	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1021	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1061	expand => 1,	1022	expand => 1,
1062	align => 0,	1023	align => 0,
1063	text => "Login",	1024	text => "Login",
1064	on_activate => sub {	1025	on_activate => sub {
1065	$CONN ? stop_game	1026	$CONN ? stop_game
1066	: start_game;	1027	: start_game;
		1028	0
1067	},	1029	},
1068	);	1030	);
1069		1031
1070	$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");
1071	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1033	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1072	text => $CFG->{say_command},	1034	text => $CFG->{say_command},
1073	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. "
1074	. "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. "
1075	. "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.",
1076	on_changed => sub {	1038	on_changed => sub {
1077	my ($self, $value) = @_;	1039	my ($self, $value) = @_;
1078	$CFG->{say_command} = $value;	1040	$CFG->{say_command} = $value;
		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),
		1067	has_close_button => 1;
1105		1068
1106	$vbox->add ($LOGVIEW);	1069	$vbox->add ($LOGVIEW);
1107		1070
1108	$vbox->add (my $input = new CFClient::UI::Entry	1071	$vbox->add (my $input = new CFPlus::UI::Entry
1109	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> "
1110	. "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>...). "
1111	. "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). "
1112	. "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.",
1113	on_focus_in => sub {	1076	on_focus_in => sub {
…		…
1117		1080
1118	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1081	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119	$input->{refocus_map} = 1;	1082	$input->{refocus_map} = 1;
1120	}	1083	}
1121	delete $input->{auto_activated};	1084	delete $input->{auto_activated};
		1085
		1086	0
1122	},	1087	},
1123	on_activate => sub {	1088	on_activate => sub {
1124	my ($input, $text) = @_;	1089	my ($input, $text) = @_;
1125	$input->set_text ('');	1090	$input->set_text ('');
1126		1091
…		…
1132	}	1097	}
1133	if ($input->{refocus_map}) {	1098	if ($input->{refocus_map}) {
1134	delete $input->{refocus_map};	1099	delete $input->{refocus_map};
1135	$MAPWIDGET->focus_in	1100	$MAPWIDGET->focus_in
1136	}	1101	}
		1102
		1103	0
1137	},	1104	},
1138	on_escape => sub {	1105	on_escape => sub {
1139	$MAPWIDGET->focus_in	1106	$MAPWIDGET->grab_focus;
		1107
		1108	0
1140	},	1109	},
1141	);	1110	);
1142		1111
1143	$CONSOLE = {	1112	$CONSOLE = {
1144	window => $window,	1113	window => $window,
…		…
1146	};	1115	};
1147		1116
1148	$window	1117	$window
1149	}	1118	}
1150		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
1151	sub open_quit_dialog {	1139	sub open_quit_dialog {
1152	unless ($QUIT_DIALOG) {	1140	unless ($QUIT_DIALOG) {
1153	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1141	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1154	x => "center",	1142	x => "center",
1155	y => "center",	1143	y => "center",
1156	z => 50,	1144	z => 50,
1157	title => "Really Quit?",	1145	title => "Really Quit?",
		1146	on_key_down => sub {
		1147	my ($dialog, $ev) = @_;
		1148	$ev->{sym} == 27 and $dialog->hide;
		1149	}
1158	;	1150	;
1159		1151
1160	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1152	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1161		1153
1162	$vb->add (new CFClient::UI::Label	1154	$vb->add (new CFPlus::UI::Label
1163	text => "You should find a savebed and apply it first!",	1155	text => "You should find a savebed and apply it first!",
1164	max_w => $WIDTH * 0.25,	1156	max_w => $WIDTH * 0.25,
1165	ellipsize => 0,	1157	ellipsize => 0,
1166	);	1158	);
1167	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1159	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1168	$hb->add (new CFClient::UI::Button	1160	$hb->add (new CFPlus::UI::Button
1169	text => "Ok",	1161	text => "Ok",
1170	expand => 1,	1162	expand => 1,
1171	on_activate => sub { $QUIT_DIALOG->hide },	1163	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172	);	1164	);
1173	$hb->add (new CFClient::UI::Button	1165	$hb->add (new CFPlus::UI::Button
1174	text => "Quit anyway",	1166	text => "Quit anyway",
1175	expand => 1,	1167	expand => 1,
1176	on_activate => sub { exit },	1168	on_activate => sub { exit },
1177	);	1169	);
1178	}	1170	}
1179		1171
1180	$QUIT_DIALOG->show;	1172	$QUIT_DIALOG->show;
		1173	$QUIT_DIALOG->grab_focus;
1181	}	1174	}
1182		1175
1183	sub autopickup_setup {	1176	sub autopickup_setup {
1184	my $table = new CFClient::UI::Table;	1177	my $table = new CFPlus::UI::Table;
1185		1178
1186	for (	1179	for (
1187	["General", 0, 0,	1180	["General", 0, 0,
1188	["Enable autopickup" => PICKUP_NEWMODE],	1181	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189	["Inhibit autopickup" => PICKUP_INHIBIT],	1182	["Inhibit autopickup" => PICKUP_INHIBIT],
1190	["Stop before pickup" => PICKUP_STOP],	1183	["Stop before pickup" => PICKUP_STOP],
1191	["Debug autopickup" => PICKUP_DEBUG],	1184	["Debug autopickup" => PICKUP_DEBUG],
1192	],	1185	],
1193	["Weapons", 0, 6,	1186	["Weapons", 0, 6,
…		…
1223	],	1216	],
1224	["Weight/Value ratio", 2, 17]	1217	["Weight/Value ratio", 2, 17]
1225	)	1218	)
1226	{	1219	{
1227	my ($title, $x, $y, @bits) = @$_;	1220	my ($title, $x, $y, @bits) = @$_;
1228	$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]);
1229		1222
1230	for (@bits) {	1223	for (@bits) {
1231	++$y;	1224	++$y;
1232		1225
1233	my $mask = $_->[1];	1226	my $mask = $_->[1];
1234	$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);
1235	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1228	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1236	state => $CFG->{pickup} & $mask,	1229	state => $::CFG->{pickup} & $mask,
1237	on_changed => sub {	1230	on_changed => sub {
1238	my ($box, $value) = @_;	1231	my ($box, $value) = @_;
1239		1232
1240	if ($value) {	1233	if ($value) {
1241	$::CFG->{pickup} |= $mask;	1234	$::CFG->{pickup} |= $mask;
…		…
1243	$::CFG->{pickup} &= ~$mask;	1236	$::CFG->{pickup} &= ~$mask;
1244	}	1237	}
1245		1238
1246	$::CONN->send_command ("pickup $::CFG->{pickup}")	1239	$::CONN->send_command ("pickup $::CFG->{pickup}")
1247	if defined $::CONN;	1240	if defined $::CONN;
		1241
		1242	0
1248	});	1243	});
		1244
		1245	${$_->[2]} = $checkbox if $_->[2];
1249	}	1246	}
1250	}	1247	}
1251		1248
1252	$table->add (2, 18, new CFClient::UI::ValSlider	1249	$table->add (2, 18, new CFPlus::UI::ValSlider
1253	range => [0, 0, 16, 1, 1],	1250	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1251	template => ">= 99",
1254	to_value => sub { ">= " . 5 * $_[0] },	1252	to_value => sub { ">= " . 5 * $_[0] },
1255	on_changed => sub {	1253	on_changed => sub {
1256	my ($slider, $value) = @_;	1254	my ($slider, $value) = @_;
1257		1255
1258	$::CFG->{pickup} &= ~0x7;	1256	$::CFG->{pickup} &= ~0xF;
1259	$::CFG->{pickup} |= int $value	1257	$::CFG->{pickup} |= int $value
1260	if $value;	1258	if $value;
1261	1;	1259	1;
1262	});	1260	});
		1261
1263	$table->add (3, 18, new CFClient::UI::Button	1262	$table->add (3, 18, new CFPlus::UI::Button
1264	text => "set",	1263	text => "set",
1265	on_activate => sub {	1264	on_activate => sub {
1266	$::CONN->send_command ("pickup $::CFG->{pickup}")	1265	$::CONN->send_command ("pickup $::CFG->{pickup}")
1267	if defined $::CONN;	1266	if defined $::CONN;
1268	1;	1267	0
1269	});	1268	});
1270		1269
1271	$table	1270	$table
1272	}	1271	}
1273		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
1274	sub inventory_window {	1286	sub inventory_widget {
		1287	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1288
		1289	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		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);
		1313	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1314
		1315	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1316
		1317	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1318
		1319	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1320	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1321
		1322	# XXX: Call after $INVR = ... because set_opencont sets the items
		1323	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1324
		1325	$hb
		1326	}
		1327
		1328	sub toggle_player_page {
		1329	my ($widget) = @_;
		1330
		1331	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1332	$PL_WINDOW->hide;
		1333	} else {
		1334	$PL_NOTEBOOK->set_current_page ($widget);
		1335	$PL_WINDOW->show;
		1336	}
		1337	}
		1338
		1339	sub player_window {
1275	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1340	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1276	x => "center",	1341	x => "center",
1277	y => "center",	1342	y => "center",
1278	force_w => $WIDTH * 9/10,	1343	force_w => $WIDTH * 9/10,
1279	force_h => $HEIGHT * 9/10,	1344	force_h => $HEIGHT * 9/10,
1280	title => "Inventory",	1345	title => "Player",
		1346	name => "playerbook",
		1347	has_close_button => 1
1281	;	1348	;
1282		1349
1283	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1350	my $ntb =
		1351	$PL_NOTEBOOK =
		1352	new CFPlus::UI::Notebook expand => 1, debug => 1;
1284		1353
1285	$hb->add (my $vb1 = new CFClient::UI::VBox);	1354	$ntb->add (
1286	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1355	"Statistics (F2)" => $STATS_PAGE = stats_window,
1287	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1356	"Shows statistics, where all your Stats and Resistances are shown."
		1357	);
		1358	$ntb->add (
		1359	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1360	"Shows all your Skills."
		1361	);
1288		1362
1289	$hb->add (my $vb2 = new CFClient::UI::VBox);	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,
		1367	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1368	);
		1369	$ntb->add (
		1370	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1371	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1372	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1373	);
1290		1374
1291	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1375	$ntb->set_current_page ($INVENTORY_PAGE);
1292		1376
1293	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1377	$plwin->add ($ntb);
1294		1378	$plwin
1295	# XXX: Call after $INVR = ... because set_opencont sets the items
1296	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298	$invwin
1299	}	1379	}
1300		1380
1301	sub spell_setup {	1381	sub update_bindings {
1302	new CFClient::UI::SpellList	1382	$BIND_UPD_CB->() if $BIND_UPD_CB;
1303	}	1383	}
1304		1384
1305	sub keyboard_setup {	1385	sub keyboard_setup {
1306	my $binding_list = new CFClient::UI::VBox;	1386	my $binding_list = new CFPlus::UI::VBox;
1307		1387
1308	my $refresh;	1388	my $refresh;
1309	$refresh = sub {	1389	$refresh = $BIND_UPD_CB = sub {
1310	$binding_list->clear ();	1390	$binding_list->clear ();
1311		1391
1312	for my $mod (keys %{$::CFG->{bindings}}) {	1392	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1393	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1394	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1395	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316		1396
1317	my $lbl = join "; ", @$cmds;	1397	my $lbl = join "; ", @$cmds;
1318	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1398	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1319	$binding_list->add (my $hb = new CFClient::UI::HBox);	1399	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1320	$hb->add (new CFClient::UI::Button	1400	$hb->add (new CFPlus::UI::Button
1321	text => "delete",	1401	text => "delete",
1322	tooltip => "Deletes the binding",	1402	tooltip => "Deletes the binding",
1323	on_activate => sub {	1403	on_activate => sub {
1324	$binding_list->remove ($hb);	1404	$binding_list->remove ($hb);
1325	delete $::CFG->{bindings}->{$mod}->{$sym};	1405	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1406	0
1326	});	1407	});
1327		1408
1328	$hb->add (new CFClient::UI::Button	1409	$hb->add (new CFPlus::UI::Button
1329	text => "edit",	1410	text => "edit",
1330	tooltip => "Edits the binding",	1411	tooltip => "Edits the binding",
1331	on_activate => sub {	1412	on_activate => sub {
1332	$::BIND_EDITOR->set_binding (	1413	$::BIND_EDITOR->set_binding (
1333	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1414	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334	sub {	1415	sub {
1335	my ($nmod, $nsym, $ncmds) = @_;	1416	my ($nmod, $nsym, $ncmds) = @_;
1336	delete $::CFG->{bindings}->{$mod}->{$sym};	1417	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1418	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338	$refresh->();	1419	$refresh->();
1339	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1420	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340	$SETUP_DIALOG->show;	1421	$SETUP_DIALOG->show;
1341	},	1422	},
1342	sub {	1423	sub {
1343	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1424	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344	$SETUP_DIALOG->show;	1425	$SETUP_DIALOG->show;
1345	});	1426	});
1346	$::BIND_EDITOR->show;	1427	$::BIND_EDITOR->show;
1347	$SETUP_DIALOG->hide;	1428	$SETUP_DIALOG->hide;
		1429	0
1348	});	1430	});
1349		1431
1350	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1432	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1351	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1433	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1352	}	1434	}
1353	}	1435	}
1354	};	1436	};
1355		1437
1356	my $vb = new CFClient::UI::VBox;	1438	my $vb = new CFPlus::UI::VBox;
1357	$vb->add (my $hb = new CFClient::UI::HBox);	1439	$vb->add (my $hb = new CFPlus::UI::HBox);
1358	$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");
1359	$hb->add (new CFClient::UI::CheckBox	1441	$hb->add (new CFPlus::UI::CheckBox
1360	expand => 1,	1442	expand => 1,
1361	state => $CFG->{shift_fire_stop},	1443	state => $CFG->{shift_fire_stop},
1362	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",
1363	on_changed => sub {	1445	on_changed => sub {
1364	my ($cbox, $value) = @_;	1446	my ($cbox, $value) = @_;
1365	$CFG->{shift_fire_stop} = $value;	1447	$CFG->{shift_fire_stop} = $value;
		1448	0
1366	});	1449	});
1367		1450
1368	$vb->add ($binding_list);	1451	$vb->add ($binding_list);
1369	$vb->add (my $hb = new CFClient::UI::HBox);	1452	$vb->add (my $hb = new CFPlus::UI::HBox);
1370		1453
1371	$hb->add (new CFClient::UI::Button	1454	$hb->add (new CFPlus::UI::Button
1372	text => "record new",	1455	text => "record new",
1373	expand => 1,	1456	expand => 1,
1374	tooltip => "This button opens the binding editor with an empty binding.",	1457	tooltip => "This button opens the binding editor with an empty binding.",
1375	on_activate => sub {	1458	on_activate => sub {
1376	$::BIND_EDITOR->set_binding (undef, undef, [],	1459	$::BIND_EDITOR->set_binding (undef, undef, [],
1377	sub {	1460	sub {
1378	my ($mod, $sym, $cmds) = @_;	1461	my ($mod, $sym, $cmds) = @_;
1379	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1462	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380	$refresh->();	1463	$refresh->();
1381	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1464	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382	$SETUP_DIALOG->show;	1465	$SETUP_DIALOG->show;
1383	},	1466	},
1384	sub {	1467	sub {
…		…
1386	$SETUP_DIALOG->show;	1469	$SETUP_DIALOG->show;
1387	},	1470	},
1388	);	1471	);
1389	$SETUP_DIALOG->hide;	1472	$SETUP_DIALOG->hide;
1390	$::BIND_EDITOR->show;	1473	$::BIND_EDITOR->show;
		1474	0
1391	},	1475	},
1392	);	1476	);
1393		1477
1394	$hb->add (new CFClient::UI::Button	1478	$hb->add (new CFPlus::UI::Button
1395	text => "close",	1479	text => "close",
1396	tooltip => "Closes the binding window",	1480	tooltip => "Closes the binding window",
1397	expand => 1,	1481	expand => 1,
1398	on_activate => sub {	1482	on_activate => sub {
1399	$SETUP_DIALOG->hide;	1483	$SETUP_DIALOG->hide;
		1484	0
1400	}	1485	}
1401	);	1486	);
1402		1487
1403	$refresh->();	1488	$refresh->();
1404		1489
1405	$vb	1490	$vb
1406	}	1491	}
1407		1492
1408	sub help_window {	1493	sub help_window {
1409	my $win = new CFClient::UI::FancyFrame	1494	my $win = new CFPlus::UI::FancyFrame
1410	x => 'center',	1495	x => 'center',
1411	y => 'center',	1496	y => 'center',
1412	z => 2,	1497	z => 2,
1413	name => 'doc_browser',	1498	name => 'doc_browser',
1414	force_w => int $WIDTH * 7/8,	1499	force_w => int $WIDTH * 7/8,
1415	force_h => int $HEIGHT * 7/8,	1500	force_h => int $HEIGHT * 7/8,
1416	title => "Documentation";	1501	title => "Help Browser",
		1502	has_close_button => 1;
1417		1503
1418	$win->add (my $vbox = new CFClient::UI::VBox);	1504	$win->add (my $vbox = new CFPlus::UI::VBox);
1419		1505
1420	$vbox->add (my $buttons = new CFClient::UI::HBox);	1506	$vbox->add (my $buttons = new CFPlus::UI::HBox);
1421	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1507	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1422	expand => 1, fontsize => 0.8, padding_x => 4);	1508	expand => 1, fontsize => 0.8, padding_x => 4);
1423		1509
1424	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1510	my @history;
1425	$buttons->add (my $combo = new CFClient::UI::Combobox	1511	my @future;
1426	value => undef,	1512	my $curnode;
1427	options => [	1513
1428	[intro => "Introduction"],	1514	my $load_node; $load_node = sub {
1429	[manual => "Manual"],	1515	my ($node) = @_;
1430	[skill_help => "Skills"],	1516
1431	[command_help => "Commands"],	1517	$buttons->clear;
1432	[dmcommand_help => "DM Commands"],	1518
1433	[COPYING => "License Terms"],	1519	if (@history) {
		1520	$buttons->add (new CFPlus::UI::Button
		1521	text => "⋘",
		1522	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>",
		1523	on_activate => sub {
		1524	unshift @future, $curnode if $curnode;
		1525	$load_node->(pop @history);
		1526	},
		1527	);
1434	],	1528	}
1435	on_changed => sub {
1436	my ($self, $pod) = @_;
1437		1529
1438	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1530	if (@future) {
1439	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1531	$buttons->add (new CFPlus::UI::Button
		1532	text => "⋙",
		1533	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>",
		1534	on_activate => sub {
		1535	push @history, $curnode;
		1536	$load_node->(shift @future);
		1537	},
		1538	);
		1539	}
1440		1540
		1541	$buttons->add (new CFPlus::UI::Label text => " ");
		1542
		1543	my @path = CFPlus::Pod::full_path_of $node;
		1544	pop @path; # drop current node
		1545
		1546	for my $node (@path) {
		1547	$buttons->add (new CFPlus::UI::Button
		1548	text => $node->{kw}[0],
		1549	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1550	on_activate => sub {
		1551	push @history, $curnode if $curnode; @future = ();
		1552	$load_node->($node);
		1553	},
		1554	);
		1555	$buttons->add (new CFPlus::UI::Label text => "/");
		1556	}
		1557
		1558	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0]);
		1559
		1560	$curnode = $node;
		1561
1441	$viewer->clear;	1562	$viewer->clear;
1442		1563	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1443	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444	for @$pom;
1445
1446	$viewer->set_offset (0);	1564	$viewer->set_offset (0);
1447	},
1448	on_visibility_change => sub {
1449	my ($self, $visible) = @_;
1450	return unless $visible;
1451	return if $self->{value};
1452	$self->set_value ("intro");
1453	},
1454	);	1565	};
		1566
		1567	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1568
		1569	$CFPlus::Pod::goto_document = sub {
		1570	my (@path) = @_;
		1571
		1572	push @history, $curnode if $curnode; @future = ();
		1573
		1574	$load_node->(CFPlus::Pod::find @path);
		1575	$win->show;
		1576	};
1455		1577
1456	$win	1578	$win
1457	}	1579	}
1458		1580
1459	sub sdl_init {	1581	sub sdl_init {
1460	CFClient::SDL_Init	1582	CFPlus::SDL_Init
1461	and die "SDL::Init failed!\n";	1583	and die "SDL::Init failed!\n";
1462	}	1584	}
1463		1585
1464	sub video_init {	1586	sub video_init {
1465	sdl_init;	1587	sdl_init;
…		…
1470		1592
1471	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1593	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1472	$FULLSCREEN = $CFG->{fullscreen};	1594	$FULLSCREEN = $CFG->{fullscreen};
1473	$FAST = $CFG->{fast};	1595	$FAST = $CFG->{fast};
1474		1596
1475	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1597	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1476	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1598	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1477		1599
1478	$SDL_ACTIVE = 1;	1600	$SDL_ACTIVE = 1;
1479	$LAST_REFRESH = time - 0.01;	1601	$LAST_REFRESH = time - 0.01;
1480		1602
1481	CFClient::OpenGL::init;	1603	CFPlus::OpenGL::init;
1482		1604
1483	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1605	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1484		1606
1485	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1607	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1486		1608
1487	#############################################################################	1609	#############################################################################
1488		1610
1489	if ($DEBUG_STATUS) {	1611	if ($DEBUG_STATUS) {
1490	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1612	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1491	} else {	1613	} else {
1492	# create the widgets	1614	# create the widgets
1493		1615
1494	$DEBUG_STATUS = new CFClient::UI::Label	1616	$DEBUG_STATUS = new CFPlus::UI::Label
1495	padding => 0,	1617	padding => 0,
1496	z => 100,	1618	z => 100,
1497	force_x => "max",	1619	force_x => "max",
1498	force_y => 0;	1620	force_y => 0;
1499	$DEBUG_STATUS->show;	1621	$DEBUG_STATUS->show;
1500		1622
1501	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1623	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1502		1624
1503	$STATUSBOX = new CFClient::UI::Statusbox;	1625	$STATUSBOX = new CFPlus::UI::Statusbox;
1504	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1626	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505		1627
1506	(new CFClient::UI::Frame	1628	(new CFPlus::UI::Frame
1507	bg => [0, 0, 0, 0.4],	1629	bg => [0, 0, 0, 0.4],
1508	force_x => 0,	1630	force_x => 0,
1509	force_y => "max",	1631	force_y => "max",
1510	child => $STATUSBOX,	1632	child => $STATUSBOX,
1511	)->show;	1633	)->show;
1512		1634
1513	CFClient::UI::FancyFrame->new (	1635	CFPlus::UI::FancyFrame->new (
1514	title => "Map",	1636	title => "Map",
1515	name => "mapmap",	1637	name => "mapmap",
1516	x => 0,	1638	x => 0,
1517	y => $FONTSIZE + 8,	1639	y => $FONTSIZE + 8,
1518	border_bg => [1, 1, 1, 192/255],	1640	border_bg => [1, 1, 1, 192/255],
1519	bg => [1, 1, 1, 0],	1641	bg => [1, 1, 1, 0],
1520	no_close_button => 1,
1521	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1642	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1522	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1643	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523	),	1644	),
1524	)->show;	1645	)->show;
1525		1646
1526	$MAPWIDGET = new CFClient::MapWidget;	1647	$MAPWIDGET = new CFPlus::MapWidget;
1527	$MAPWIDGET->connect (activate_console => sub {	1648	$MAPWIDGET->connect (activate_console => sub {
1528	my ($mapwidget, $preset) = @_;	1649	my ($mapwidget, $preset) = @_;
1529		1650
1530	if ($CONSOLE) {	1651	if ($CONSOLE) {
1531	$CONSOLE->{input}->{auto_activated} = 1;	1652	$CONSOLE->{input}->{auto_activated} = 1;
1532	$CONSOLE->{input}->focus_in;	1653	$CONSOLE->{input}->grab_focus;
1533		1654
1534	if ($preset && $CONSOLE->{input}->get_text eq '') {	1655	if ($preset && $CONSOLE->{input}->get_text eq '') {
1535	$CONSOLE->{input}->set_text ($preset);	1656	$CONSOLE->{input}->set_text ($preset);
1536	}	1657	}
1537	}	1658	}
1538	});	1659	});
1539	$MAPWIDGET->show;	1660	$MAPWIDGET->show;
1540	$MAPWIDGET->focus_in;	1661	$MAPWIDGET->grab_focus;
1541		1662
1542	$LOGVIEW = new CFClient::UI::TextScroller	1663	$LOGVIEW = new CFPlus::UI::TextScroller
1543	expand => 1,	1664	expand => 1,
1544	font => $FONT_FIXED,	1665	font => $FONT_FIXED,
1545	fontsize => $::CFG->{log_fontsize},	1666	fontsize => $::CFG->{log_fontsize},
1546	indent => -4,	1667	indent => -4,
1547	can_hover => 1,	1668	can_hover => 1,
1548	can_events => 1,	1669	can_events => 1,
1549	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1670	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1550	;	1671	;
1551		1672
1552	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1673	$SETUP_DIALOG = new CFPlus::UI::FancyFrame
1553	title => "Setup",	1674	title => "Setup",
1554	name => "setup_dialog",	1675	name => "setup_dialog",
1555	x => 'center',	1676	x => 'center',
1556	y => 'center',	1677	y => 'center',
1557	z => 2,	1678	z => 2,
1558	force_w => $::WIDTH * 0.6,	1679	force_w => $::WIDTH * 0.6,
1559	force_h => $::HEIGHT * 0.6,	1680	force_h => $::HEIGHT * 0.6,
		1681	has_close_button => 1,
1560	;	1682	;
1561		1683
		1684	$METASERVER = metaserver_dialog;
		1685
1562	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1686	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1563	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1687	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564		1688
1565	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1689	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1566	"Configure the server to play on, your username, password and other server-related options.");	1690	"Configure the server to play on, your username, password and other server-related options.");
1567	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1691	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1568	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1692	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1569	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1693	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1694	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1695	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1572	"Configure the use of audio, sound effects and background music.");	1696	"Configure the use of audio, sound effects and background music.");
1573	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1697	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574	"Lets you define, edit and delete bindings."	1698	"Lets you define, edit and delete key bindings."
1575	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1699	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1576	. "with nothing set and the recording started. After doing the actions you "	1700	. "with nothing set and the recording started. After doing the actions you "
1577	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1701	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578	. "After pressing the combo the binding will be saved automatically and the "	1702	. "After pressing the combo the binding will be saved automatically and the "
1579	. "binding editor closes");	1703	. "binding editor closes");
1580	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1704	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1583	"Some debuggign options. Do not ask.");	1705	"Some debuggin' options. Do not ask.");
1584		1706
1585	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1707	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586		1708
1587	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1709	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1588	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1710	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1589		1711
1590	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1712	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1591	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1713	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592		1714
1593	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	1715	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
1594		1716
1595	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1596	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1597	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,	1717	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1598	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1718	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1599	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1600		1719
1601	$BUTTONBAR->add (new CFClient::UI::Button	1720	$BUTTONBAR->add (new CFPlus::UI::Button
1602	text => "Save Config",	1721	text => "Save Config",
1603	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1722	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1604	on_activate => sub {	1723	on_activate => sub {
1605	$::CFG->{layout} = CFClient::UI::get_layout;	1724	$::CFG->{layout} = CFPlus::UI::get_layout;
1606	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1725	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607	status "Configuration Saved";	1726	status "Configuration Saved";
		1727	0
1608	},	1728	},
1609	);	1729	);
1610		1730
1611	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,	1731	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612	tooltip => "View Documentation");	1732	tooltip => "View Documentation");
1613		1733
1614	$BUTTONBAR->add (new CFClient::UI::Button	1734	$BUTTONBAR->add (new CFPlus::UI::Button
1615	text => "Quit",	1735	text => "Quit",
1616	tooltip => "Terminates the program",	1736	tooltip => "Terminates the program",
1617	on_activate => sub {	1737	on_activate => sub {
1618	if ($CONN) {	1738	if ($CONN) {
1619	open_quit_dialog;	1739	open_quit_dialog;
1620	} else {	1740	} else {
1621	exit;	1741	exit;
1622	}	1742	}
		1743	0
1623	},	1744	},
1624	);	1745	);
1625		1746
1626	$BUTTONBAR->show;	1747	$BUTTONBAR->show;
1627	$SETUP_DIALOG->show;	1748	$SETUP_DIALOG->show;
…		…
1629		1750
1630	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1751	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1631	}	1752	}
1632		1753
1633	sub video_shutdown {	1754	sub video_shutdown {
1634	CFClient::OpenGL::shutdown;	1755	CFPlus::OpenGL::shutdown;
1635		1756
1636	undef $SDL_ACTIVE;	1757	undef $SDL_ACTIVE;
1637	}	1758	}
1638		1759
1639	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1760	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1647		1768
1648	sub audio_music_finished {	1769	sub audio_music_finished {
1649	return unless $CFG->{bgm_enable};	1770	return unless $CFG->{bgm_enable};
1650		1771
1651	# TODO: hack, do play loop and mood music	1772	# TODO: hack, do play loop and mood music
1652	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1773	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1653	$bgmusic->play (0);	1774	$bgmusic->play (0);
1654		1775
1655	push @bgmusic, shift @bgmusic;	1776	push @bgmusic, shift @bgmusic;
1656	}	1777	}
1657		1778
1658	sub audio_init {	1779	sub audio_init {
1659	if ($CFG->{audio_enable}) {	1780	if ($CFG->{audio_enable}) {
1660	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1781	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1661	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1782	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1662		1783
1663	unless ($SDL_MIXER) {	1784	unless ($SDL_MIXER) {
1664	status "Unable to open sound device: there will be no sound";	1785	status "Unable to open sound device: there will be no sound";
1665	return;	1786	return;
1666	}	1787	}
1667		1788
1668	CFClient::Mix_AllocateChannels 8;	1789	CFPlus::Mix_AllocateChannels 8;
1669	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1790	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1670		1791
1671	audio_music_finished;	1792	audio_music_finished;
1672		1793
1673	while (<$fh>) {	1794	while (<$fh>) {
1674	next if /^\s*#/;	1795	next if /^\s*#/;
…		…
1677	my ($file, $volume, $event) = split /\s+/, $_, 3;	1798	my ($file, $volume, $event) = split /\s+/, $_, 3;
1678		1799
1679	push @SOUNDS, "$volume,$file";	1800	push @SOUNDS, "$volume,$file";
1680		1801
1681	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1802	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1682	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1803	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1683	$chunk->volume ($volume * 128 / 100);	1804	$chunk->volume ($volume * 128 / 100);
1684	$chunk	1805	$chunk
1685	};	1806	};
1686	}	1807	}
1687	} else {	1808	} else {
…		…
1689	}	1810	}
1690	}	1811	}
1691	}	1812	}
1692		1813
1693	sub audio_shutdown {	1814	sub audio_shutdown {
1694	CFClient::Mix_CloseAudio if $SDL_MIXER;	1815	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1695	undef $SDL_MIXER;	1816	undef $SDL_MIXER;
1696	@SOUNDS = ();	1817	@SOUNDS = ();
1697	%AUDIO_CHUNKS = ();	1818	%AUDIO_CHUNKS = ();
1698	}	1819	}
1699		1820
…		…
1706		1827
1707	sub force_refresh {	1828	sub force_refresh {
1708	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1829	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1709	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1830	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1710		1831
1711	$CFClient::UI::ROOT->draw;	1832	$CFPlus::UI::ROOT->draw;
1712		1833
1713	$WANT_REFRESH = 0;	1834	$WANT_REFRESH = 0;
1714	$CAN_REFRESH = 0;	1835	$CAN_REFRESH = 0;
1715	$LAST_REFRESH = $NOW;	1836	$LAST_REFRESH = $NOW;
1716		1837
1717	0 && do {
1718	# some weird model-drawing code, just a joke right now
1719	use CFClient::OpenGL;
1720
1721	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1722	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1723	$demo{r} ||= do {
1724	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1725	$mod->{v} = pack "f*", @{$mod->{v}};
1726	$_ = [scalar @$_, pack "S!*", @$_]
1727	for values %{$mod->{g}};
1728	$mod
1729	};
1730
1731	my $r = $demo{r} or die;
1732
1733	glDepthMask 1;
1734	glClear GL_DEPTH_BUFFER_BIT;
1735	glEnable GL_TEXTURE_2D;
1736	glEnable GL_DEPTH_TEST;
1737	glEnable GL_CULL_FACE;
1738	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1739
1740	glMatrixMode GL_PROJECTION;
1741	glLoadIdentity;
1742	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1743	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1744	glMatrixMode GL_MODELVIEW;
1745	glLoadIdentity;
1746
1747	glPushMatrix;
1748	glTranslate 0, 0, -800;
1749	glScale 1, -1, 1;
1750	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1751	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1752	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1753	glScale 50, 50, 50;
1754
1755	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1756	while (my ($k, $v) = each %{$r->{g}}) {
1757	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1758	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1759	}
1760
1761	glPopMatrix;
1762
1763	glShadeModel GL_FLAT;
1764	glDisable GL_DEPTH_TEST;
1765	glDisable GL_TEXTURE_2D;
1766	glDepthMask 0;
1767
1768	$WANT_REFRESH++;
1769	};
1770
1771	CFClient::SDL_GL_SwapBuffers;	1838	CFPlus::SDL_GL_SwapBuffers;
1772	}	1839	}
1773		1840
1774	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1841	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1775	$NOW = time;	1842	$NOW = time;
1776		1843
1777	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1844	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1778	for CFClient::SDL_PollEvent;	1845	for CFPlus::SDL_PollEvent;
1779		1846
1780	if (%animate_object) {	1847	if (%animate_object) {
1781	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1848	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1782	$WANT_REFRESH++;	1849	$WANT_REFRESH++;
1783	}	1850	}
…		…
1807	$CONN->face_prefetch	1874	$CONN->face_prefetch
1808	if $CONN;	1875	if $CONN;
1809	});	1876	});
1810		1877
1811	%SDL_CB = (	1878	%SDL_CB = (
1812	CFClient::SDL_QUIT => sub {	1879	CFPlus::SDL_QUIT => sub {
1813	Event::unloop -1;	1880	Event::unloop -1;
1814	},	1881	},
1815	CFClient::SDL_VIDEORESIZE => sub {	1882	CFPlus::SDL_VIDEORESIZE => sub {
1816	},	1883	},
1817	CFClient::SDL_VIDEOEXPOSE => sub {	1884	CFPlus::SDL_VIDEOEXPOSE => sub {
1818	CFClient::UI::full_refresh;	1885	CFPlus::UI::full_refresh;
1819	},	1886	},
1820	CFClient::SDL_ACTIVEEVENT => sub {	1887	CFPlus::SDL_ACTIVEEVENT => sub {
1821	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1888	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1822	},	1889	},
1823	CFClient::SDL_KEYDOWN => sub {	1890	CFPlus::SDL_KEYDOWN => sub {
1824	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1891	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1825	# alt-enter	1892	# alt-enter
		1893	$FULLSCREEN_ENABLE->toggle;
1826	video_shutdown;	1894	video_shutdown;
1827	$CFG->{fullscreen} = !$CFG->{fullscreen};
1828	video_init;	1895	video_init;
1829	} else {	1896	} else {
1830	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1897	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1831	}	1898	}
1832	},	1899	},
1833	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1900	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1834	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1901	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1835	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1902	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1836	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1903	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1837	CFClient::SDL_USEREVENT => sub {	1904	CFPlus::SDL_USEREVENT => sub {
1838	if ($_[0]{code} == 1) {	1905	if ($_[0]{code} == 1) {
1839	audio_channel_finished $_[0]{data1};	1906	audio_channel_finished $_[0]{data1};
1840	} elsif ($_[0]{code} == 0) {	1907	} elsif ($_[0]{code} == 0) {
1841	audio_music_finished;	1908	audio_music_finished;
1842	}	1909	}
…		…
1846	#############################################################################	1913	#############################################################################
1847		1914
1848	$SIG{INT} = $SIG{TERM} = sub { exit };	1915	$SIG{INT} = $SIG{TERM} = sub { exit };
1849		1916
1850	{	1917	{
1851	local $SIG{__DIE__} = sub {
1852	return unless defined $^S && !$^S;
1853	Carp::confess $_[1];#d#TODO: remove when stable
1854	CFClient::fatal $_[0];
1855	};
1856
1857	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1918	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1858	CFClient::UI::set_layout ($::CFG->{layout});	1919	CFPlus::UI::set_layout ($::CFG->{layout});
1859		1920
1860	my %DEF_CFG = (	1921	my %DEF_CFG = (
1861	sdl_mode => 0,	1922	sdl_mode => 0,
1862	width => 640,	1923	width => 640,
1863	height => 480,	1924	height => 480,
1864	fullscreen => 0,	1925	fullscreen => 0,
1865	fast => 0,	1926	fast => 0,
1866	map_scale => 1,	1927	map_scale => 1,
1867	fow_enable => 1,	1928	fow_enable => 1,
1868	fow_intensity => 0.45,	1929	fow_intensity => 0.45,
1869	fow_smooth => 0,	1930	fow_smooth => 0,
1870	gui_fontsize => 1,	1931	gui_fontsize => 1,
1871	log_fontsize => 0.7,	1932	log_fontsize => 0.7,
1872	gauge_fontsize=> 1,	1933	gauge_fontsize => 1,
1873	gauge_size => 0.35,	1934	gauge_size => 0.35,
1874	stat_fontsize => 0.7,	1935	stat_fontsize => 0.7,
1875	mapsize => 100,	1936	mapsize => 100,
1876	host => "crossfire.schmorp.de",
1877	say_command => 'say',	1937	say_command => 'say',
1878	audio_enable => 1,	1938	audio_enable => 1,
1879	bgm_enable => 1,	1939	bgm_enable => 1,
1880	bgm_volume => 0.25,	1940	bgm_volume => 0.25,
1881	face_prefetch => 0,	1941	face_prefetch => 0,
1882	output_sync => 1,	1942	output_sync => 1,
1883	output_count => 1,	1943	output_count => 1,
1884	pickup => 0,	1944	pickup => 0,
		1945	inv_sort => "mtime",
		1946	default => "profile", # default profile
		1947	);
1885	);	1948
1886
1887	while (my ($k, $v) = each %DEF_CFG) {	1949	while (my ($k, $v) = each %DEF_CFG) {
1888	$CFG->{$k} = $v unless exists $CFG->{$k};	1950	$CFG->{$k} = $v unless exists $CFG->{$k};
1889	}	1951	}
1890		1952
		1953	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		1954
1891	sdl_init;	1955	sdl_init;
1892		1956
1893	@SDL_MODES = reverse	1957	@SDL_MODES = reverse
1894	grep $_->[0] >= 640 && $_->[1] >= 480,	1958	grep $_->[0] >= 640 && $_->[1] >= 480,
1895	CFClient::SDL_ListModes;	1959	CFPlus::SDL_ListModes;
1896		1960
1897	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1961	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1898		1962
1899	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1963	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1900		1964
1901	{	1965	{
1902	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1966	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1903	DejaVuSans.ttf	1967	DejaVuSans.ttf
1904	DejaVuSansMono.ttf	1968	DejaVuSansMono.ttf
1905	DejaVuSans-Bold.ttf	1969	DejaVuSans-Bold.ttf
1906	DejaVuSansMono-Bold.ttf	1970	DejaVuSansMono-Bold.ttf
1907	DejaVuSans-Oblique.ttf	1971	DejaVuSans-Oblique.ttf
1908	DejaVuSansMono-Oblique.ttf	1972	DejaVuSansMono-Oblique.ttf
1909	DejaVuSans-BoldOblique.ttf	1973	DejaVuSans-BoldOblique.ttf
1910	DejaVuSansMono-BoldOblique.ttf	1974	DejaVuSansMono-BoldOblique.ttf
1911	);	1975	);
1912		1976
1913	CFClient::add_font $_ for @fonts;	1977	CFPlus::add_font $_ for @fonts;
1914		1978
1915	CFClient::pango_init;	1979	CFPlus::pango_init;
1916		1980
1917	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	1981	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1918	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	1982	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1919		1983
1920	$FONT_PROP->make_default;	1984	$FONT_PROP->make_default;
1921	}	1985	}
1922		1986
1923	# compare mono (ft) vs. rgba (cairo)	1987	# compare mono (ft) vs. rgba (cairo)
1924	# ft - 1.8s, cairo 3s, even in alpha-only mode	1988	# ft - 1.8s, cairo 3s, even in alpha-only mode
1925	# for my $rgba (0..1) {	1989	# for my $rgba (0..1) {
1926	# my $t1 = Time::HiRes::time;	1990	# my $t1 = Time::HiRes::time;
1927	# for (1..1000) {	1991	# for (1..1000) {
1928	# my $layout = CFClient::Layout->new ($rgba);	1992	# my $layout = CFPlus::Layout->new ($rgba);
1929	# $layout->set_text ("hallo" x 100);	1993	# $layout->set_text ("hallo" x 100);
1930	# $layout->render;	1994	# $layout->render;
1931	# }	1995	# }
1932	# my $t2 = Time::HiRes::time;	1996	# my $t2 = Time::HiRes::time;
1933	# warn $t2-$t1;	1997	# warn $t2-$t1;
…		…
1936	video_init;	2000	video_init;
1937	audio_init;	2001	audio_init;
1938	}	2002	}
1939		2003
1940	Event::loop;	2004	Event::loop;
1941	#CFClient::SDL_Quit;	2005	#CFPlus::SDL_Quit;
1942	#CFClient::_exit 0;	2006	#CFPlus::_exit 0;
1943		2007
1944	END { CFClient::SDL_Quit }	2008	END { CFPlus::SDL_Quit }
1945		2009
1946	=head1 NAME	2010	=head1 NAME
1947		2011
1948	cfplus - A Crossfire+ and Crossfire game client	2012	cfplus - A Crossfire+ and Crossfire game client
1949		2013

Diff Legend

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