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.68 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.117 by elmex, Tue Aug 15 06:30:05 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::Toplevel
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 (new CFPlus::UI::FancyFrame
		669	label => "Player",
		670	child => (my $pi = new CFPlus::UI::VBox),
		671	);
		672
668	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	673	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669	can_hover => 1, can_events => 1,	674	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.");	675	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,	676	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672	can_hover => 1, can_events => 1,	677	can_hover => 1, can_events => 1,
673	tooltip => "The map you are currently on (if supported by the server).");	678	tooltip => "The map you are currently on (if supported by the server).");
674		679
675	$vb->add (my $hb0 = new CFClient::UI::HBox);	680	$pi->add (my $hb0 = new CFPlus::UI::HBox);
676	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	681	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677	can_hover => 1, can_events => 1,	682	can_hover => 1, can_events => 1,
678	tooltip => "The weight of the player including all inventory items.");	683	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,	684	$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,	685	can_hover => 1, can_events => 1,
681	tooltip => "The weight limit: you cannot carry more than this.");	686	tooltip => "The weight limit: you cannot carry more than this.");
682		687
683		688	$vb->add (new CFPlus::UI::FancyFrame
		689	label => "Primary/Secondary Statistics",
684	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	690	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		691	);
685	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	692	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
686		693
687	my $color2 = [1, 1, 0];	694	my $color2 = [1, 1, 0];
688		695
689	for (	696	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"],	697	[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"],	698	[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"],	699	[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"],	700	[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"],	701	[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"],	702	[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."],	703	[0, 6, st_cha => "Cha", 30],
697		704
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."],	705	[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."],	706	[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."],	707	[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."],	708	[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."],	709	[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."],	710	[2, 5, st_wspd => "WSp", 10.54],
704	) {	711	) {
705	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	712	my ($col, $row, $id, $label, $template) = @$_;
706		713
707	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	714	$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);	715	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		716	align => +1, template => $template, tooltip => "#stat_$label");
709	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	717	$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);	718	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		719	align => -1, text => $label, tooltip => "#stat_$label");
711	}	720	}
712		721
		722	$vb->add (new CFPlus::UI::FancyFrame
		723	label => "Resistancies",
713	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	724	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		725	);
714		726
715	my $row = 0;	727	my $row = 0;
716	my $col = 0;	728	my $col = 0;
717		729
718	my %resist_names = (	730	my %resist_names = (
		731	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.)",	732	"<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.)"],
		733	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.)",	734	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		735	conf => ["Confusion",
721	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	736	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		737	fire => ["Fire",
722	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	738	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		739	depl => ["Depletion",
723	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	740	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		741	magic => ["Magic",
724	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	742	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		743	drain => ["Draining",
725	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	744	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		745	acid => ["Acid",
726	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	746	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		747	pois => ["Poison",
727	pois => "<b>Poison</b> (resistance to getting poisoned)",	748	"<b>Poison</b> (resistance to getting poisoned)"],
		749	para => ["Paralysation",
728	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	750	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		751	deat => ["Death",
729	deat => "<b>Death</b> (resistance against death spells)",	752	"<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)",	753	phys => ["Physical",
		754	"<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.)"],
		755	blind => ["Blind",
731	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	756	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		757	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)",	758	"<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)"],
		759	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...",	760	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		761	elec => ["Electricity",
734	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	762	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		763	cold => ["Cold",
735	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	764	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		765	ghit => ["Ghost hit",
736	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	766	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737	);	767	);
738	for (qw/slow holyw conf fire depl magic	768	for (qw/slow holyw conf fire depl magic
739	drain acid pois para deat phys	769	drain acid pois para deat phys
740	blind fear tund elec cold ghit/)	770	blind fear tund elec cold ghit/)
741	{	771	{
742	$tbl2->add ($col, $row,	772	$tbl2->add ($col, $row,
743	$STATWIDS->{"res_$_"} =	773	$STATWIDS->{"res_$_"} =
744	new CFClient::UI::Label	774	new CFPlus::UI::Label
745	font => $FONT_FIXED,	775	font => $FONT_FIXED,
746	template => "-100%",	776	template => "-100%",
747	align => +1,	777	align => +1,
748	valign => 0,	778	valign => 0,
749	can_events => 1,	779	can_events => 1,
750	can_hover => 1,	780	can_hover => 1,
751	tooltip => $resist_names{$_},	781	tooltip => $resist_names{$_}->[1],
752	);	782	);
753	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	783	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
754	font => $FONT_FIXED,	784	font => $FONT_FIXED,
755	can_hover => 1,	785	can_hover => 1,
756	can_events => 1,	786	can_events => 1,
757	image => "ui/resist/resist_$_.png",	787	path => "ui/resist/resist_$_.png",
758	tooltip => $resist_names{$_},	788	tooltip => $resist_names{$_}->[1],
		789	);
		790	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
		791	text => $resist_names{$_}->[0],
		792	font => $FONT_FIXED,
		793	can_hover => 1,
		794	can_events => 1,
		795	tooltip => $resist_names{$_}->[1],
759	);	796	);
760		797
761	$row++;	798	$row++;
762	if ($row % 6 == 0) {	799	if ($row % 6 == 0) {
763	$col += 2;	800	$col += 3;
764	$row = 0;	801	$row = 0;
765	}	802	}
766	}	803	}
767		804
768	&set_stats_window_fontsize;
769	update_stats_window ({});	805	#update_stats_window ({});
770		806
		807	$r
		808	}
		809
		810	sub skill_window {
		811	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		812	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771	$tgw	813	$sw
772	}	814	}
773		815
774	sub formsep($) {	816	sub formsep($) {
775	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776	}	818	}
777		819
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	# TODO: replace by CS_STAT_RES_xxx constants
822	my %tbl = (
823	phys => 100,
824	magic => 101,
825	fire => 102,
826	elec => 103,
827	cold => 104,
828	conf => 105,
829	acid => 106,
830	drain => 107,
831	ghit => 108,
832	pois => 109,
833	slow => 110,
834	para => 111,
835	tund => 112,
836	fear => 113,
837	depl => 113,
838	deat => 115,
839	holyw => 116,
840	blind => 117,
841	);
842
843	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
844	for keys %tbl;
845	}
846
847	my $METASERVER_ATIME;	820	my $METASERVER_ATIME;
848		821
849	sub update_metaserver {	822	sub update_metaserver {
		823	my ($metaserver_dialog) = @_;
		824
		825	$METASERVER = $metaserver_dialog
		826	if defined $metaserver_dialog;
		827
850	return if $METASERVER_ATIME > time;	828	return if $METASERVER_ATIME > time;
851	$METASERVER_ATIME = time + 60;	829	$METASERVER_ATIME = time + 60;
852		830
853	my $table = $METASERVER->{table};	831	my $table = $METASERVER->{table};
854	$table->clear;	832	$table->clear;
855	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	833	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
856		834
857	my $buf;	835	my $buf;
858		836
859	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
860		838
…		…
883	"The time this server has been running without being restarted.",	861	"The time this server has been running without being restarted.",
884	"The server software version - a '+' indicates a Crossfire+ server.",	862	"The server software version - a '+' indicates a Crossfire+ server.",
885	"Short information about this server provided by its admins.",	863	"Short information about this server provided by its admins.",
886	);	864	);
887	my @col = qw(#Users Host Uptime Version Description);	865	my @col = qw(#Users Host Uptime Version Description);
888	$table->add ($_, 0, new CFClient::UI::Label	866	$table->add ($_, 0, new CFPlus::UI::Label
889	can_hover => 1, can_events => 1,	867	can_hover => 1, can_events => 1,
890	align => 0, fg => [1, 1, 0],	868	align => 0, fg => [1, 1, 0],
891	text => $col[$_], tooltip => $tip[$_])	869	text => $col[$_], tooltip => $tip[$_])
892	for 0 .. $#col;	870	for 0 .. $#col;
893		871
…		…
914		892
915	$m = [$users, $host, $uptime, $version, $desc];	893	$m = [$users, $host, $uptime, $version, $desc];
916		894
917	$y++;	895	$y++;
918		896
919	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	897	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
920	(new CFClient::UI::Button	898	(new CFPlus::UI::Button
921	text => "Use",	899	text => "Use",
922	tooltip => "Put this server into the <b>Host:Port</b> field",	900	tooltip => "Put this server into the <b>Host:Port</b> field",
923	on_activate => sub {	901	on_activate => sub {
924	$HOST_ENTRY->set_text ($CFG->{host} = $host);	902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925	$METASERVER->hide;	903	$METASERVER->hide;
		904	0
926	},	905	},
927	),	906	),
928	(new CFClient::UI::Empty expand => 1),	907	(new CFPlus::UI::Empty expand => 1),
929	]);	908	]);
930		909
931	$table->add ($_, $y, new CFClient::UI::Label	910	$table->add ($_, $y, new CFPlus::UI::Label
932	ellipsise => 0,	911	ellipsise => 0,
933	align => $align[$_],	912	align => $align[$_],
934	text => $m->[$_],	913	text => $m->[$_],
935	tooltip => $tip[$_],	914	tooltip => $tip[$_],
936	can_hover => 1,	915	can_hover => 1,
…		…
941	}	920	}
942	});	921	});
943	}	922	}
944		923
945	sub metaserver_dialog {	924	sub metaserver_dialog {
946	my $dialog = new CFClient::UI::FancyFrame	925	my $vbox = new CFPlus::UI::VBox;
		926	my $table = new CFPlus::UI::Table;
		927	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		928
		929	my $dialog = new CFPlus::UI::Toplevel
947	title => "Server List",	930	title => "Server List",
948	name => 'metaserver_dialog',	931	name => 'metaserver_dialog',
949	x => 'center',	932	x => 'center',
950	y => 'center',	933	y => 'center',
951	z => 3,	934	z => 3,
952	force_h => $::HEIGHT * 0.4,	935	force_h => $::HEIGHT * 0.4,
953	child => (my $vbox = new CFClient::UI::VBox),	936	child => $vbox,
		937	has_close_button => 1,
		938	table => $table,
954	on_visibility_change => sub {	939	on_visibility_change => sub {
955	update_metaserver if $_[1];	940	update_metaserver ($_[0]) if $_[1];
		941	0
956	},	942	},
957	;	943	;
958		944
959	$dialog->{table} = new CFClient::UI::Table;
960
961	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963	$dialog	945	$dialog
964	}	946	}
965		947
966	sub server_setup {	948	sub server_setup {
967	my $vbox = new CFClient::UI::VBox;	949	my $vbox = new CFPlus::UI::VBox;
968		950
		951	$vbox->add (new CFPlus::UI::FancyFrame
		952	label => "Connection Settings",
969	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	953	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		954	);
970	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	955	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
971		956
972	{	957	{
973	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	958	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
974		959
975	$vbox->add (	960	$vbox->add (
976	$HOST_ENTRY = new CFClient::UI::Entry	961	$HOST_ENTRY = new CFPlus::UI::Entry
977	expand => 1,	962	expand => 1,
978	text => $CFG->{host},	963	text => $CFG->{profile}{default}{host},
979	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	964	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980	on_changed => sub {	965	on_changed => sub {
981	my ($self, $value) = @_;	966	my ($self, $value) = @_;
982	$CFG->{host} = $value;	967	$CFG->{profile}{default}{host} = $value;
		968	0
983	}	969	}
984	);	970	);
985		971
986	$METASERVER = metaserver_dialog;
987
988	$vbox->add (new CFClient::UI::Button	972	$vbox->add (new CFPlus::UI::Button
989	expand => 1,	973	expand => 1,
990	text => "Server List",	974	text => "Server List",
991	other => $METASERVER,	975	other => $METASERVER,
992	tooltip => "Show a list of available crossfire servers",	976	tooltip => "Show a list of available crossfire servers",
993	on_activate => sub { $METASERVER->toggle_visibility },	977	on_activate => sub { $METASERVER->toggle_visibility; 0 },
994	on_visibility_change => sub { $METASERVER->hide unless $_[1] },	978	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
995	);	979	);
996	}	980	}
997		981
998	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	982	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
999	$table->add (1, 4, new CFClient::UI::Entry	983	$table->add (1, 4, new CFPlus::UI::Entry
1000	text => $CFG->{user},	984	text => $CFG->{profile}{default}{user},
1001	tooltip => "The name of your character on the server",	985	tooltip => "The name of your character on the server",
1002	on_changed => sub {	986	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1003	my ($self, $value) = @_;
1004	$CFG->{user} = $value;
1005	}
1006	);	987	);
1007		988
1008	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	989	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1009	$table->add (1, 5, new CFClient::UI::Entry	990	$table->add (1, 5, new CFPlus::UI::Entry
1010	text => $CFG->{password},	991	text => $CFG->{profile}{default}{password},
1011	hidden => 1,	992	hidden => 1,
1012	tooltip => "The password for your character",	993	tooltip => "The password for your character",
1013	on_changed => sub {	994	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1014	my ($self, $value) = @_;
1015	$CFG->{password} = $value;
1016	}
1017	);	995	);
1018		996
1019	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	997	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1020	$table->add (1, 7, new CFClient::UI::Slider	998	$table->add (1, 7, new CFPlus::UI::Slider
1021	force_w => 100,	999	force_w => 100,
1022	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1000	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1023	tooltip => "This is the size of the portion of the map update the server sends you. "	1001	tooltip => "This is the size of the portion of the map update the server sends you. "
1024	. "If you set this to a high value you will be able to see further, "	1002	. "If you set this to a high value you will be able to see further, "
1025	. "but you also increase bandwidth requirements and latency. "	1003	. "but you also increase bandwidth requirements and latency. "
1026	. "This option is only used once at log-in.",	1004	. "This option is only used once at log-in.",
1027	on_changed => sub {	1005	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1028	my ($self, $value) = @_;
1029
1030	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1031	},
1032	);	1006	);
1033		1007
1034	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1008	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1035	$table->add (1, 8, new CFClient::UI::CheckBox	1009	$table->add (1, 8, new CFPlus::UI::CheckBox
1036	state => $CFG->{face_prefetch},	1010	state => $CFG->{face_prefetch},
1037	tooltip => "<b>Background Image Prefetch</b>\n\n"	1011	tooltip => "<b>Background Image Prefetch</b>\n\n"
1038	. "If enabled, the client automatically pre-fetches images from the server. "	1012	. "If enabled, the client automatically pre-fetches images from the server. "
1039	. "This might increase or create lag, but increases the chances "	1013	. "This might increase or create lag, but increases the chances "
1040	. "of faces being ready for display when you encounter them. "	1014	. "of faces being ready for display when you encounter them. "
1041	. "It also uses up server bandwidth on every connect, "	1015	. "It also uses up server bandwidth on every connect, "
1042	. "so only set it if you really need to prefetch images. "	1016	. "so only set it if you really need to prefetch images. "
1043	. "This option can be set and unset any time.",	1017	. "This option can be set and unset any time.",
1044	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1018	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1045	);	1019	);
1046		1020
1047	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1021	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1048	$table->add (1, 9, new CFClient::UI::Entry	1022	$table->add (1, 9, new CFPlus::UI::Entry
1049	text => $CFG->{output_count},	1023	text => $CFG->{output_count},
1050	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1024	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1051	on_changed => sub { $CFG->{output_count} = $_[1] },	1025	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1052	);	1026	);
1053		1027
1054	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1028	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1055	$table->add (1, 10, new CFClient::UI::Entry	1029	$table->add (1, 10, new CFPlus::UI::Entry
1056	text => $CFG->{output_sync},	1030	text => $CFG->{output_sync},
1057	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1031	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058	on_changed => sub { $CFG->{output_sync} = $_[1] },	1032	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1059	);	1033	);
1060		1034
1061	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1035	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1062	expand => 1,	1036	expand => 1,
1063	align => 0,	1037	align => 0,
1064	text => "Login",	1038	text => "Login",
1065	on_activate => sub {	1039	on_activate => sub {
1066	$CONN ? stop_game	1040	$CONN ? stop_game
1067	: start_game;	1041	: start_game;
		1042	0
1068	},	1043	},
1069	);	1044	);
1070		1045
1071	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1046	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1072	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1047	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1073	text => $CFG->{say_command},	1048	text => $CFG->{say_command},
1074	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. "	1049	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. "
1075	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1050	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1051	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077	on_changed => sub {	1052	on_changed => sub {
1078	my ($self, $value) = @_;	1053	my ($self, $value) = @_;
1079	$CFG->{say_command} = $value;	1054	$CFG->{say_command} = $value;
		1055	0
1080	}	1056	}
1081	);	1057	);
1082		1058
1083	$vbox->add (new CFClient::UI::Label	1059	$vbox->add (new CFPlus::UI::FancyFrame
1084	text => "Server Info",	1060	label => "Server Info",
1085	fontsize => 1.2,
1086	padding_y => 8,
1087	fg => [1, 1, 0, 1],
1088	);
1089
1090	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1061	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1062	);
1091		1063
1092	$vbox	1064	$vbox
1093	}	1065	}
1094		1066
1095	sub message_window {	1067	sub message_window {
1096	my $window = new CFClient::UI::FancyFrame	1068	my $window = new CFPlus::UI::Toplevel
1097	name => "message_window",	1069	name => "message_window",
1098	title => "Messages",	1070	title => "Messages",
1099	border_bg => [1, 1, 1, 1],	1071	border_bg => [1, 1, 1, 1],
1100	bg => [0, 0, 0, 0.75],
1101	x => "max",	1072	x => "max",
1102	y => 0,	1073	y => 0,
1103	force_w => $::WIDTH * 0.4,	1074	force_w => $::WIDTH * 0.4,
1104	force_h => $::HEIGHT * 0.5,	1075	force_h => $::HEIGHT * 0.5,
1105	child => (my $vbox = new CFClient::UI::VBox);	1076	child => (my $vbox = new CFPlus::UI::VBox),
		1077	has_close_button => 1;
1106		1078
1107	$vbox->add ($LOGVIEW);	1079	$vbox->add ($LOGVIEW);
1108		1080
1109	$vbox->add (my $input = new CFClient::UI::Entry	1081	$vbox->add (my $input = new CFPlus::UI::Entry
1110	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1082	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1111	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1083	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1112	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1084	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1113	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1085	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1114	on_focus_in => sub {	1086	on_focus_in => sub {
…		…
1118		1090
1119	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1091	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1120	$input->{refocus_map} = 1;	1092	$input->{refocus_map} = 1;
1121	}	1093	}
1122	delete $input->{auto_activated};	1094	delete $input->{auto_activated};
		1095
		1096	0
1123	},	1097	},
1124	on_activate => sub {	1098	on_activate => sub {
1125	my ($input, $text) = @_;	1099	my ($input, $text) = @_;
1126	$input->set_text ('');	1100	$input->set_text ('');
1127		1101
…		…
1133	}	1107	}
1134	if ($input->{refocus_map}) {	1108	if ($input->{refocus_map}) {
1135	delete $input->{refocus_map};	1109	delete $input->{refocus_map};
1136	$MAPWIDGET->focus_in	1110	$MAPWIDGET->focus_in
1137	}	1111	}
		1112
		1113	0
1138	},	1114	},
1139	on_escape => sub {	1115	on_escape => sub {
1140	$MAPWIDGET->focus_in	1116	$MAPWIDGET->grab_focus;
		1117
		1118	0
1141	},	1119	},
1142	);	1120	);
1143		1121
1144	$CONSOLE = {	1122	$CONSOLE = {
1145	window => $window,	1123	window => $window,
…		…
1147	};	1125	};
1148		1126
1149	$window	1127	$window
1150	}	1128	}
1151		1129
		1130	sub open_string_query {
		1131	my ($title, $cb, $txt, $tooltip) = @_;
		1132	my $dialog = new CFPlus::UI::Toplevel
		1133	x => "center",
		1134	y => "center",
		1135	z => 50,
		1136	force_w => $WIDTH * 4/5,
		1137	title => $title;
		1138
		1139	$dialog->add (
		1140	my $e = new CFPlus::UI::Entry
		1141	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1142	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1143	tooltip => $tooltip
		1144	);
		1145
		1146	$e->grab_focus;
		1147	$e->set_text ($txt) if $txt;
		1148	$dialog->show;
		1149	}
		1150
1152	sub open_quit_dialog {	1151	sub open_quit_dialog {
1153	unless ($QUIT_DIALOG) {	1152	unless ($QUIT_DIALOG) {
1154	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1153	$QUIT_DIALOG = new CFPlus::UI::Toplevel
1155	x => "center",	1154	x => "center",
1156	y => "center",	1155	y => "center",
1157	z => 50,	1156	z => 50,
1158	title => "Really Quit?",	1157	title => "Really Quit?",
		1158	on_key_down => sub {
		1159	my ($dialog, $ev) = @_;
		1160	$ev->{sym} == 27 and $dialog->hide;
		1161	}
1159	;	1162	;
1160		1163
1161	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1164	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1162		1165
1163	$vb->add (new CFClient::UI::Label	1166	$vb->add (new CFPlus::UI::Label
1164	text => "You should find a savebed and apply it first!",	1167	text => "You should find a savebed and apply it first!",
1165	max_w => $WIDTH * 0.25,	1168	max_w => $WIDTH * 0.25,
1166	ellipsize => 0,	1169	ellipsize => 0,
1167	);	1170	);
1168	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1171	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1169	$hb->add (new CFClient::UI::Button	1172	$hb->add (new CFPlus::UI::Button
1170	text => "Ok",	1173	text => "Ok",
1171	expand => 1,	1174	expand => 1,
1172	on_activate => sub { $QUIT_DIALOG->hide },	1175	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173	);	1176	);
1174	$hb->add (new CFClient::UI::Button	1177	$hb->add (new CFPlus::UI::Button
1175	text => "Quit anyway",	1178	text => "Quit anyway",
1176	expand => 1,	1179	expand => 1,
1177	on_activate => sub { exit },	1180	on_activate => sub { exit },
1178	);	1181	);
1179	}	1182	}
1180		1183
1181	$QUIT_DIALOG->show;	1184	$QUIT_DIALOG->show;
		1185	$QUIT_DIALOG->grab_focus;
1182	}	1186	}
1183		1187
1184	sub autopickup_setup {	1188	sub autopickup_setup {
1185	my $table = new CFClient::UI::Table;	1189	my $table = new CFPlus::UI::Table;
1186		1190
1187	for (	1191	for (
1188	["General", 0, 0,	1192	["General", 0, 0,
1189	["Enable autopickup" => PICKUP_NEWMODE],	1193	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190	["Inhibit autopickup" => PICKUP_INHIBIT],	1194	["Inhibit autopickup" => PICKUP_INHIBIT],
1191	["Stop before pickup" => PICKUP_STOP],	1195	["Stop before pickup" => PICKUP_STOP],
1192	["Debug autopickup" => PICKUP_DEBUG],	1196	["Debug autopickup" => PICKUP_DEBUG],
1193	],	1197	],
1194	["Weapons", 0, 6,	1198	["Weapons", 0, 6,
…		…
1224	],	1228	],
1225	["Weight/Value ratio", 2, 17]	1229	["Weight/Value ratio", 2, 17]
1226	)	1230	)
1227	{	1231	{
1228	my ($title, $x, $y, @bits) = @$_;	1232	my ($title, $x, $y, @bits) = @$_;
1229	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1233	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230		1234
1231	for (@bits) {	1235	for (@bits) {
1232	++$y;	1236	++$y;
1233		1237
1234	my $mask = $_->[1];	1238	my $mask = $_->[1];
1235	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1239	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1240	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237	state => $CFG->{pickup} & $mask,	1241	state => $::CFG->{pickup} & $mask,
1238	on_changed => sub {	1242	on_changed => sub {
1239	my ($box, $value) = @_;	1243	my ($box, $value) = @_;
1240		1244
1241	if ($value) {	1245	if ($value) {
1242	$::CFG->{pickup} |= $mask;	1246	$::CFG->{pickup} |= $mask;
…		…
1244	$::CFG->{pickup} &= ~$mask;	1248	$::CFG->{pickup} &= ~$mask;
1245	}	1249	}
1246		1250
1247	$::CONN->send_command ("pickup $::CFG->{pickup}")	1251	$::CONN->send_command ("pickup $::CFG->{pickup}")
1248	if defined $::CONN;	1252	if defined $::CONN;
		1253
		1254	0
1249	});	1255	});
		1256
		1257	${$_->[2]} = $checkbox if $_->[2];
1250	}	1258	}
1251	}	1259	}
1252		1260
1253	$table->add (2, 18, new CFClient::UI::ValSlider	1261	$table->add (2, 18, new CFPlus::UI::ValSlider
1254	range => [0, 0, 16, 1, 1],	1262	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1263	template => ">= 99",
1255	to_value => sub { ">= " . 5 * $_[0] },	1264	to_value => sub { ">= " . 5 * $_[0] },
1256	on_changed => sub {	1265	on_changed => sub {
1257	my ($slider, $value) = @_;	1266	my ($slider, $value) = @_;
1258		1267
1259	$::CFG->{pickup} &= ~0x7;	1268	$::CFG->{pickup} &= ~0xF;
1260	$::CFG->{pickup} |= int $value	1269	$::CFG->{pickup} |= int $value
1261	if $value;	1270	if $value;
1262	1;	1271	1;
1263	});	1272	});
		1273
1264	$table->add (3, 18, new CFClient::UI::Button	1274	$table->add (3, 18, new CFPlus::UI::Button
1265	text => "set",	1275	text => "set",
1266	on_activate => sub {	1276	on_activate => sub {
1267	$::CONN->send_command ("pickup $::CFG->{pickup}")	1277	$::CONN->send_command ("pickup $::CFG->{pickup}")
1268	if defined $::CONN;	1278	if defined $::CONN;
1269	1;	1279	0
1270	});	1280	});
1271		1281
1272	$table	1282	$table
1273	}	1283	}
1274		1284
		1285	my %SORT_ORDER = (
		1286	type => undef,
		1287	mtime => sub { sort {
		1288	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1289	or $b->{mtime} <=> $a->{mtime}
		1290	or $a->{type} <=> $b->{type}
		1291	} @_ },
		1292	weight => sub { sort {
		1293	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1294	or $a->{type} <=> $b->{type}
		1295	} @_ },
		1296	);
		1297
1275	sub inventory_window {	1298	sub inventory_widget {
1276	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1299	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1300
		1301	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		1302	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1303
		1304	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1305
		1306	use sort 'stable';
		1307
		1308	$hb1->add (new CFPlus::UI::Selector
		1309	value => $::CFG->{inv_sort},
		1310	options => [
		1311	[type => "Type/Name"],
		1312	[mtime => "Recent/Normal/Locked"],
		1313	[weight => "Weight/Type"],
		1314	],
		1315	on_changed => sub {
		1316	$::CFG->{inv_sort} = $_[1];
		1317	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1318	},
		1319	);
		1320	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1321	#TODO# update to weigh/maxweight
		1322	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1323
		1324	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1325	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1326
		1327	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1328
		1329	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1330
		1331	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1332	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1333
		1334	# XXX: Call after $INVR = ... because set_opencont sets the items
		1335	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1336
		1337	$hb
		1338	}
		1339
		1340	sub toggle_player_page {
		1341	my ($widget) = @_;
		1342
		1343	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1344	$PL_WINDOW->hide;
		1345	} else {
		1346	$PL_NOTEBOOK->set_current_page ($widget);
		1347	$PL_WINDOW->show;
		1348	}
		1349	}
		1350
		1351	sub player_window {
		1352	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1277	x => "center",	1353	x => "center",
1278	y => "center",	1354	y => "center",
1279	force_w => $WIDTH * 9/10,	1355	force_w => $WIDTH * 9/10,
1280	force_h => $HEIGHT * 9/10,	1356	force_h => $HEIGHT * 9/10,
1281	title => "Inventory",	1357	title => "Player",
		1358	name => "playerbook",
		1359	has_close_button => 1
1282	;	1360	;
1283		1361
1284	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1362	my $ntb =
		1363	$PL_NOTEBOOK =
		1364	new CFPlus::UI::Notebook expand => 1, debug => 1;
1285		1365
1286	$hb->add (my $vb1 = new CFClient::UI::VBox);	1366	$ntb->add (
1287	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1367	"Statistics (F2)" => $STATS_PAGE = stats_window,
1288	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1368	"Shows statistics, where all your Stats and Resistances are shown."
		1369	);
		1370	$ntb->add (
		1371	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1372	"Shows all your Skills."
		1373	);
1289		1374
1290	$hb->add (my $vb2 = new CFClient::UI::VBox);	1375	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1376	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
		1377	$ntb->add (
		1378	"Spellbook (F4)" => $spellsw,
		1379	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1380	);
		1381	$ntb->add (
		1382	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1383	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1384	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1385	);
1291		1386
1292	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1387	$ntb->set_current_page ($INVENTORY_PAGE);
1293		1388
1294	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1389	$plwin->add ($ntb);
1295		1390	$plwin
1296	# XXX: Call after $INVR = ... because set_opencont sets the items
1297	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299	$invwin
1300	}	1391	}
1301		1392
1302	sub spell_setup {	1393	sub update_bindings {
1303	new CFClient::UI::SpellList	1394	$BIND_UPD_CB->() if $BIND_UPD_CB;
1304	}	1395	}
1305		1396
1306	sub keyboard_setup {	1397	sub keyboard_setup {
1307	my $binding_list = new CFClient::UI::VBox;	1398	my $binding_list = new CFPlus::UI::VBox;
1308		1399
1309	my $refresh;	1400	my $refresh;
1310	$refresh = sub {	1401	$refresh = $BIND_UPD_CB = sub {
1311	$binding_list->clear ();	1402	$binding_list->clear ();
1312		1403
1313	for my $mod (keys %{$::CFG->{bindings}}) {	1404	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1405	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1406	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1407	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317		1408
1318	my $lbl = join "; ", @$cmds;	1409	my $lbl = join "; ", @$cmds;
1319	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1410	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1320	$binding_list->add (my $hb = new CFClient::UI::HBox);	1411	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1321	$hb->add (new CFClient::UI::Button	1412	$hb->add (new CFPlus::UI::Button
1322	text => "delete",	1413	text => "delete",
1323	tooltip => "Deletes the binding",	1414	tooltip => "Deletes the binding",
1324	on_activate => sub {	1415	on_activate => sub {
1325	$binding_list->remove ($hb);	1416	$binding_list->remove ($hb);
1326	delete $::CFG->{bindings}->{$mod}->{$sym};	1417	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1418	0
1327	});	1419	});
1328		1420
1329	$hb->add (new CFClient::UI::Button	1421	$hb->add (new CFPlus::UI::Button
1330	text => "edit",	1422	text => "edit",
1331	tooltip => "Edits the binding",	1423	tooltip => "Edits the binding",
1332	on_activate => sub {	1424	on_activate => sub {
1333	$::BIND_EDITOR->set_binding (	1425	$::BIND_EDITOR->set_binding (
1334	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1426	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1335	sub {	1427	sub {
1336	my ($nmod, $nsym, $ncmds) = @_;	1428	my ($nmod, $nsym, $ncmds) = @_;
1337	delete $::CFG->{bindings}->{$mod}->{$sym};	1429	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1338	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1430	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1339	$refresh->();	1431	$refresh->();
1340	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1432	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341	$SETUP_DIALOG->show;	1433	$SETUP_DIALOG->show;
1342	},	1434	},
1343	sub {	1435	sub {
1344	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1436	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345	$SETUP_DIALOG->show;	1437	$SETUP_DIALOG->show;
1346	});	1438	});
1347	$::BIND_EDITOR->show;	1439	$::BIND_EDITOR->show;
1348	$SETUP_DIALOG->hide;	1440	$SETUP_DIALOG->hide;
		1441	0
1349	});	1442	});
1350		1443
1351	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1444	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1352	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1445	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1353	}	1446	}
1354	}	1447	}
1355	};	1448	};
1356		1449
1357	my $vb = new CFClient::UI::VBox;	1450	my $vb = new CFPlus::UI::VBox;
1358	$vb->add ($binding_list);	1451	$vb->add (new CFPlus::UI::FancyFrame
		1452	label => "Options",
		1453	child => (my $hb = new CFPlus::UI::HBox),
		1454	);
		1455	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
		1456	$hb->add (new CFPlus::UI::CheckBox
		1457	expand => 1,
		1458	state => $CFG->{shift_fire_stop},
		1459	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1460	on_changed => sub {
		1461	my ($cbox, $value) = @_;
		1462	$CFG->{shift_fire_stop} = $value;
		1463	0
		1464	});
		1465
		1466	$vb->add (new CFPlus::UI::FancyFrame
		1467	label => "Bindings",
		1468	child => $binding_list);
1359	$vb->add (my $hb = new CFClient::UI::HBox);	1469	$vb->add (my $hb = new CFPlus::UI::HBox);
1360		1470
1361	$hb->add (new CFClient::UI::Button	1471	$hb->add (new CFPlus::UI::Button
1362	text => "record new",	1472	text => "record new",
1363	expand => 1,	1473	expand => 1,
1364	tooltip => "This button opens the binding editor with an empty binding.",	1474	tooltip => "This button opens the binding editor with an empty binding.",
1365	on_activate => sub {	1475	on_activate => sub {
1366	$::BIND_EDITOR->set_binding (undef, undef, [],	1476	$::BIND_EDITOR->set_binding (undef, undef, [],
1367	sub {	1477	sub {
1368	my ($mod, $sym, $cmds) = @_;	1478	my ($mod, $sym, $cmds) = @_;
1369	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1479	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1370	$refresh->();	1480	$refresh->();
1371	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1481	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372	$SETUP_DIALOG->show;	1482	$SETUP_DIALOG->show;
1373	},	1483	},
1374	sub {	1484	sub {
…		…
1376	$SETUP_DIALOG->show;	1486	$SETUP_DIALOG->show;
1377	},	1487	},
1378	);	1488	);
1379	$SETUP_DIALOG->hide;	1489	$SETUP_DIALOG->hide;
1380	$::BIND_EDITOR->show;	1490	$::BIND_EDITOR->show;
		1491	0
1381	},	1492	},
1382	);	1493	);
1383		1494
1384	$hb->add (new CFClient::UI::Button	1495	$hb->add (new CFPlus::UI::Button
1385	text => "close",	1496	text => "close",
1386	tooltip => "Closes the binding window",	1497	tooltip => "Closes the binding window",
1387	expand => 1,	1498	expand => 1,
1388	on_activate => sub {	1499	on_activate => sub {
1389	$SETUP_DIALOG->hide;	1500	$SETUP_DIALOG->hide;
		1501	0
1390	}	1502	}
1391	);	1503	);
1392		1504
1393	$refresh->();	1505	$refresh->();
1394		1506
1395	$vb	1507	$vb
1396	}	1508	}
1397		1509
1398	sub help_window {	1510	sub help_window {
1399	my $win = new CFClient::UI::FancyFrame	1511	my $win = new CFPlus::UI::Toplevel
1400	x => 'center',	1512	x => 'center',
1401	y => 'center',	1513	y => 'center',
1402	z => 2,	1514	z => 2,
1403	name => 'doc_browser',	1515	name => 'doc_browser',
1404	force_w => int $WIDTH * 7/8,	1516	force_w => int $WIDTH * 7/8,
1405	force_h => int $HEIGHT * 7/8,	1517	force_h => int $HEIGHT * 7/8,
1406	title => "Documentation";	1518	title => "Help Browser",
		1519	has_close_button => 1;
1407		1520
1408	$win->add (my $vbox = new CFClient::UI::VBox);	1521	$win->add (my $vbox = new CFPlus::UI::VBox);
1409		1522
1410	$vbox->add (my $buttons = new CFClient::UI::HBox);	1523	$vbox->add (new CFPlus::UI::FancyFrame
		1524	label => "Navigation",
		1525	child => (my $buttons = new CFPlus::UI::HBox),
		1526	);
1411	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1527	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1412	expand => 1, fontsize => 0.8, padding_x => 4);	1528	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1413		1529
1414	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1530	my @history;
1415	$buttons->add (my $combo = new CFClient::UI::Combobox	1531	my @future;
1416	value => undef,	1532	my $curnode;
1417	options => [	1533
1418	[intro => "Introduction"],	1534	my $load_node; $load_node = sub {
1419	[manual => "Manual"],	1535	my ($node, $para) = @_;
1420	[skill_help => "Skills"],	1536
1421	[command_help => "Commands"],	1537	$buttons->clear;
1422	[dmcommand_help => "DM Commands"],	1538
1423	[COPYING => "License Terms"],	1539	$buttons->add (new CFPlus::UI::Button
1424	],	1540	text => "⇤",
		1541	tooltip => "back to the starting page",
1425	on_changed => sub {	1542	on_activate => sub {
1426	my ($self, $pod) = @_;	1543	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1427		1544	unshift @future, @history;
1428	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1545	@history = ();
1429	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1546	$load_node->(@{shift @future});
1430
1431	$viewer->clear;
1432		1547	},
1433	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1548	);
1434	for @$pom;
1435		1549
1436	$viewer->set_offset (0);	1550	if (@history) {
		1551	$buttons->add (new CFPlus::UI::Button
		1552	text => "⋘",
		1553	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1554	on_activate => sub {
		1555	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1556	$load_node->(@{pop @history});
		1557	},
		1558	);
1437	},	1559	}
1438	on_visibility_change => sub {	1560
1439	my ($self, $visible) = @_;	1561	if (@future) {
1440	return unless $visible;	1562	$buttons->add (new CFPlus::UI::Button
1441	return if $self->{value};	1563	text => "⋙",
1442	$self->set_value ("intro");	1564	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1565	on_activate => sub {
		1566	push @history, [$curnode, $viewer->current_paragraph];
		1567	$load_node->(@{shift @future});
		1568	},
		1569	);
1443	},	1570	}
		1571
		1572	$buttons->add (new CFPlus::UI::Label text => " ");
		1573
		1574	my @path = CFPlus::Pod::full_path_of $node;
		1575	pop @path; # drop current node
		1576
		1577	for my $node (@path) {
		1578	$buttons->add (new CFPlus::UI::Button
		1579	text => $node->{kw}[0],
		1580	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1581	on_activate => sub {
		1582	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1583	$load_node->($node);
		1584	},
		1585	);
		1586	$buttons->add (new CFPlus::UI::Label text => "/");
		1587	}
		1588
		1589	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1590
		1591	$curnode = $node;
		1592
		1593	$viewer->clear;
		1594	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1595	$viewer->scroll_to ($para);
1444	);	1596	};
		1597
		1598	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1599
		1600	$CFPlus::Pod::goto_document = sub {
		1601	my (@path) = @_;
		1602
		1603	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1604
		1605	$load_node->((CFPlus::Pod::find @path)[0]);
		1606	$win->show;
		1607	};
1445		1608
1446	$win	1609	$win
1447	}	1610	}
1448		1611
1449	sub sdl_init {	1612	sub sdl_init {
1450	CFClient::SDL_Init	1613	CFPlus::SDL_Init
1451	and die "SDL::Init failed!\n";	1614	and die "SDL::Init failed!\n";
1452	}	1615	}
1453		1616
1454	sub video_init {	1617	sub video_init {
1455	sdl_init;	1618	sdl_init;
…		…
1460		1623
1461	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1624	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1462	$FULLSCREEN = $CFG->{fullscreen};	1625	$FULLSCREEN = $CFG->{fullscreen};
1463	$FAST = $CFG->{fast};	1626	$FAST = $CFG->{fast};
1464		1627
1465	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1628	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1466	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1629	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1467		1630
1468	$SDL_ACTIVE = 1;	1631	$SDL_ACTIVE = 1;
1469	$LAST_REFRESH = time - 0.01;	1632	$LAST_REFRESH = time - 0.01;
1470		1633
1471	CFClient::OpenGL::init;	1634	CFPlus::OpenGL::init;
1472		1635
1473	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1636	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1474		1637
1475	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1638	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1476		1639
1477	#############################################################################	1640	#############################################################################
1478		1641
1479	if ($DEBUG_STATUS) {	1642	if ($DEBUG_STATUS) {
1480	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1643	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1481	} else {	1644	} else {
1482	# create the widgets	1645	# create the widgets
1483		1646
1484	$DEBUG_STATUS = new CFClient::UI::Label	1647	$DEBUG_STATUS = new CFPlus::UI::Label
1485	padding => 0,	1648	padding => 0,
1486	z => 100,	1649	z => 100,
1487	force_x => "max",	1650	force_x => "max",
1488	force_y => 0;	1651	force_y => 0;
1489	$DEBUG_STATUS->show;	1652	$DEBUG_STATUS->show;
1490		1653
1491	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1654	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1492		1655
1493	$STATUSBOX = new CFClient::UI::Statusbox;	1656	$STATUSBOX = new CFPlus::UI::Statusbox;
1494	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1657	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1495		1658
1496	(new CFClient::UI::Frame	1659	(new CFPlus::UI::Frame
1497	bg => [0, 0, 0, 0.4],	1660	bg => [0, 0, 0, 0.4],
1498	force_x => 0,	1661	force_x => 0,
1499	force_y => "max",	1662	force_y => "max",
1500	child => $STATUSBOX,	1663	child => $STATUSBOX,
1501	)->show;	1664	)->show;
1502		1665
1503	CFClient::UI::FancyFrame->new (	1666	CFPlus::UI::Toplevel->new (
1504	title => "Map",	1667	title => "Map",
1505	name => "mapmap",	1668	name => "mapmap",
1506	x => 0,	1669	x => 0,
1507	y => $FONTSIZE + 8,	1670	y => $FONTSIZE + 8,
1508	border_bg => [1, 1, 1, 192/255],	1671	border_bg => [1, 1, 1, 192/255],
1509	bg => [1, 1, 1, 0],	1672	bg => [1, 1, 1, 0],
1510	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1673	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1511	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1674	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1512	),	1675	),
1513	)->show;	1676	)->show;
1514		1677
1515	$MAPWIDGET = new CFClient::MapWidget;	1678	$MAPWIDGET = new CFPlus::MapWidget;
1516	$MAPWIDGET->connect (activate_console => sub {	1679	$MAPWIDGET->connect (activate_console => sub {
1517	my ($mapwidget, $preset) = @_;	1680	my ($mapwidget, $preset) = @_;
1518		1681
1519	if ($CONSOLE) {	1682	if ($CONSOLE) {
1520	$CONSOLE->{input}->{auto_activated} = 1;	1683	$CONSOLE->{input}->{auto_activated} = 1;
1521	$CONSOLE->{input}->focus_in;	1684	$CONSOLE->{input}->grab_focus;
1522		1685
1523	if ($preset && $CONSOLE->{input}->get_text eq '') {	1686	if ($preset && $CONSOLE->{input}->get_text eq '') {
1524	$CONSOLE->{input}->set_text ($preset);	1687	$CONSOLE->{input}->set_text ($preset);
1525	}	1688	}
1526	}	1689	}
1527	});	1690	});
1528	$MAPWIDGET->show;	1691	$MAPWIDGET->show;
1529	$MAPWIDGET->focus_in;	1692	$MAPWIDGET->grab_focus;
1530		1693
1531	$LOGVIEW = new CFClient::UI::TextScroller	1694	$LOGVIEW = new CFPlus::UI::TextScroller
1532	expand => 1,	1695	expand => 1,
1533	font => $FONT_FIXED,	1696	font => $FONT_FIXED,
1534	fontsize => $::CFG->{log_fontsize},	1697	fontsize => $::CFG->{log_fontsize},
1535	indent => -4,	1698	indent => -4,
1536	can_hover => 1,	1699	can_hover => 1,
1537	can_events => 1,	1700	can_events => 1,
1538	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1701	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1539	;	1702	;
1540		1703
1541	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1704	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1542	title => "Setup",	1705	title => "Setup",
1543	name => "setup_dialog",	1706	name => "setup_dialog",
1544	x => 'center',	1707	x => 'center',
1545	y => 'center',	1708	y => 'center',
1546	z => 2,	1709	z => 2,
1547	force_w => $::WIDTH * 0.6,	1710	force_w => $::WIDTH * 0.6,
1548	force_h => $::HEIGHT * 0.6,	1711	force_h => $::HEIGHT * 0.6,
		1712	has_close_button => 1,
1549	;	1713	;
1550		1714
		1715	$METASERVER = metaserver_dialog;
		1716
1551	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1717	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1552	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1718	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553		1719
1554	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1720	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1555	"Configure the server to play on, your username, password and other server-related options.");	1721	"Configure the server to play on, your username, password and other server-related options.");
1556	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1722	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1557	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1723	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1558	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1724	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1725	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1726	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1561	"Configure the use of audio, sound effects and background music.");	1727	"Configure the use of audio, sound effects and background music.");
1562	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1728	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563	"Lets you define, edit and delete bindings."	1729	"Lets you define, edit and delete key bindings."
1564	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1730	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1565	. "with nothing set and the recording started. After doing the actions you "	1731	. "with nothing set and the recording started. After doing the actions you "
1566	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1732	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567	. "After pressing the combo the binding will be saved automatically and the "	1733	. "After pressing the combo the binding will be saved automatically and the "
1568	. "binding editor closes");	1734	. "binding editor closes");
1569	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1735	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1572	"Some debuggign options. Do not ask.");	1736	"Some debuggin' options. Do not ask.");
1573		1737
1574	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1738	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575		1739
1576	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1740	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1577	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1741	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1578		1742
1579	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1743	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1580	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1744	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1581		1745
1582	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	1746	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
1583		1747
1584	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1585	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1586	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,	1748	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1587	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1749	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1588	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1589		1750
1590	$BUTTONBAR->add (new CFClient::UI::Button	1751	$BUTTONBAR->add (new CFPlus::UI::Button
1591	text => "Save Config",	1752	text => "Save Config",
1592	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1753	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1593	on_activate => sub {	1754	on_activate => sub {
1594	$::CFG->{layout} = CFClient::UI::get_layout;	1755	$::CFG->{layout} = CFPlus::UI::get_layout;
1595	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1756	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1596	status "Configuration Saved";	1757	status "Configuration Saved";
		1758	0
1597	},	1759	},
1598	);	1760	);
1599		1761
1600	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,	1762	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1601	tooltip => "View Documentation");	1763	tooltip => "View Documentation");
1602		1764
1603	$BUTTONBAR->add (new CFClient::UI::Button	1765	$BUTTONBAR->add (new CFPlus::UI::Button
1604	text => "Quit",	1766	text => "Quit",
1605	tooltip => "Terminates the program",	1767	tooltip => "Terminates the program",
1606	on_activate => sub {	1768	on_activate => sub {
1607	if ($CONN) {	1769	if ($CONN) {
1608	open_quit_dialog;	1770	open_quit_dialog;
1609	} else {	1771	} else {
1610	exit;	1772	exit;
1611	}	1773	}
		1774	0
1612	},	1775	},
1613	);	1776	);
1614		1777
1615	$BUTTONBAR->show;	1778	$BUTTONBAR->show;
1616	$SETUP_DIALOG->show;	1779	$SETUP_DIALOG->show;
…		…
1618		1781
1619	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1782	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1620	}	1783	}
1621		1784
1622	sub video_shutdown {	1785	sub video_shutdown {
		1786	CFPlus::OpenGL::shutdown;
		1787
1623	undef $SDL_ACTIVE;	1788	undef $SDL_ACTIVE;
1624	}	1789	}
1625		1790
1626	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1791	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1627	my $bgmusic;#TODO#hack#d#	1792	my $bgmusic;#TODO#hack#d#
…		…
1634		1799
1635	sub audio_music_finished {	1800	sub audio_music_finished {
1636	return unless $CFG->{bgm_enable};	1801	return unless $CFG->{bgm_enable};
1637		1802
1638	# TODO: hack, do play loop and mood music	1803	# TODO: hack, do play loop and mood music
1639	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1804	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1640	$bgmusic->play (0);	1805	$bgmusic->play (0);
1641		1806
1642	push @bgmusic, shift @bgmusic;	1807	push @bgmusic, shift @bgmusic;
1643	}	1808	}
1644		1809
1645	sub audio_init {	1810	sub audio_init {
1646	if ($CFG->{audio_enable}) {	1811	if ($CFG->{audio_enable}) {
1647	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1812	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1648	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1813	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1649		1814
1650	unless ($SDL_MIXER) {	1815	unless ($SDL_MIXER) {
1651	status "Unable to open sound device: there will be no sound";	1816	status "Unable to open sound device: there will be no sound";
1652	return;	1817	return;
1653	}	1818	}
1654		1819
1655	CFClient::Mix_AllocateChannels 8;	1820	CFPlus::Mix_AllocateChannels 8;
1656	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1821	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1657		1822
1658	audio_music_finished;	1823	audio_music_finished;
1659		1824
1660	while (<$fh>) {	1825	while (<$fh>) {
1661	next if /^\s*#/;	1826	next if /^\s*#/;
…		…
1664	my ($file, $volume, $event) = split /\s+/, $_, 3;	1829	my ($file, $volume, $event) = split /\s+/, $_, 3;
1665		1830
1666	push @SOUNDS, "$volume,$file";	1831	push @SOUNDS, "$volume,$file";
1667		1832
1668	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1833	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1669	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1834	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1670	$chunk->volume ($volume * 128 / 100);	1835	$chunk->volume ($volume * 128 / 100);
1671	$chunk	1836	$chunk
1672	};	1837	};
1673	}	1838	}
1674	} else {	1839	} else {
…		…
1676	}	1841	}
1677	}	1842	}
1678	}	1843	}
1679		1844
1680	sub audio_shutdown {	1845	sub audio_shutdown {
1681	CFClient::Mix_CloseAudio if $SDL_MIXER;	1846	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1682	undef $SDL_MIXER;	1847	undef $SDL_MIXER;
1683	@SOUNDS = ();	1848	@SOUNDS = ();
1684	%AUDIO_CHUNKS = ();	1849	%AUDIO_CHUNKS = ();
1685	}	1850	}
1686		1851
…		…
1693		1858
1694	sub force_refresh {	1859	sub force_refresh {
1695	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1860	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1696	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1861	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1697		1862
1698	$CFClient::UI::ROOT->draw;	1863	$CFPlus::UI::ROOT->draw;
1699		1864
1700	$WANT_REFRESH = 0;	1865	$WANT_REFRESH = 0;
1701	$CAN_REFRESH = 0;	1866	$CAN_REFRESH = 0;
1702	$LAST_REFRESH = $NOW;	1867	$LAST_REFRESH = $NOW;
1703		1868
1704	0 && do {
1705	# some weird model-drawing code, just a joke right now
1706	use CFClient::OpenGL;
1707
1708	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1709	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1710	$demo{r} ||= do {
1711	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1712	$mod->{v} = pack "f*", @{$mod->{v}};
1713	$_ = [scalar @$_, pack "S!*", @$_]
1714	for values %{$mod->{g}};
1715	$mod
1716	};
1717
1718	my $r = $demo{r} or die;
1719
1720	glDepthMask 1;
1721	glClear GL_DEPTH_BUFFER_BIT;
1722	glEnable GL_TEXTURE_2D;
1723	glEnable GL_DEPTH_TEST;
1724	glEnable GL_CULL_FACE;
1725	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1726
1727	glMatrixMode GL_PROJECTION;
1728	glLoadIdentity;
1729	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1730	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1731	glMatrixMode GL_MODELVIEW;
1732	glLoadIdentity;
1733
1734	glPushMatrix;
1735	glTranslate 0, 0, -800;
1736	glScale 1, -1, 1;
1737	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1738	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1739	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1740	glScale 50, 50, 50;
1741
1742	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1743	while (my ($k, $v) = each %{$r->{g}}) {
1744	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1745	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1746	}
1747
1748	glPopMatrix;
1749
1750	glShadeModel GL_FLAT;
1751	glDisable GL_DEPTH_TEST;
1752	glDisable GL_TEXTURE_2D;
1753	glDepthMask 0;
1754
1755	$WANT_REFRESH++;
1756	};
1757
1758	CFClient::SDL_GL_SwapBuffers;	1869	CFPlus::SDL_GL_SwapBuffers;
1759	}	1870	}
1760		1871
1761	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1872	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1762	$NOW = time;	1873	$NOW = time;
1763		1874
1764	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1875	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1765	for CFClient::SDL_PollEvent;	1876	for CFPlus::SDL_PollEvent;
1766		1877
1767	if (%animate_object) {	1878	if (%animate_object) {
1768	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1879	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1769	$WANT_REFRESH++;	1880	$WANT_REFRESH++;
1770	}	1881	}
…		…
1794	$CONN->face_prefetch	1905	$CONN->face_prefetch
1795	if $CONN;	1906	if $CONN;
1796	});	1907	});
1797		1908
1798	%SDL_CB = (	1909	%SDL_CB = (
1799	CFClient::SDL_QUIT => sub {	1910	CFPlus::SDL_QUIT => sub {
1800	Event::unloop -1;	1911	Event::unloop -1;
1801	},	1912	},
1802	CFClient::SDL_VIDEORESIZE => sub {	1913	CFPlus::SDL_VIDEORESIZE => sub {
1803	},	1914	},
1804	CFClient::SDL_VIDEOEXPOSE => sub {	1915	CFPlus::SDL_VIDEOEXPOSE => sub {
1805	CFClient::UI::full_refresh;	1916	CFPlus::UI::full_refresh;
1806	},	1917	},
1807	CFClient::SDL_ACTIVEEVENT => sub {	1918	CFPlus::SDL_ACTIVEEVENT => sub {
1808	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1919	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1809	},	1920	},
1810	CFClient::SDL_KEYDOWN => sub {	1921	CFPlus::SDL_KEYDOWN => sub {
1811	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1922	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1812	# alt-enter	1923	# alt-enter
		1924	$FULLSCREEN_ENABLE->toggle;
1813	video_shutdown;	1925	video_shutdown;
1814	$CFG->{fullscreen} = !$CFG->{fullscreen};
1815	video_init;	1926	video_init;
1816	} else {	1927	} else {
1817	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1928	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1818	}	1929	}
1819	},	1930	},
1820	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1931	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1821	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1932	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1822	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1933	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1823	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1934	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1824	CFClient::SDL_USEREVENT => sub {	1935	CFPlus::SDL_USEREVENT => sub {
1825	if ($_[0]{code} == 1) {	1936	if ($_[0]{code} == 1) {
1826	audio_channel_finished $_[0]{data1};	1937	audio_channel_finished $_[0]{data1};
1827	} elsif ($_[0]{code} == 0) {	1938	} elsif ($_[0]{code} == 0) {
1828	audio_music_finished;	1939	audio_music_finished;
1829	}	1940	}
…		…
1833	#############################################################################	1944	#############################################################################
1834		1945
1835	$SIG{INT} = $SIG{TERM} = sub { exit };	1946	$SIG{INT} = $SIG{TERM} = sub { exit };
1836		1947
1837	{	1948	{
1838	local $SIG{__DIE__} = sub {
1839	return unless defined $^S && !$^S;
1840	Carp::confess $_[1];#d#TODO: remove when stable
1841	CFClient::fatal $_[0];
1842	};
1843
1844	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1949	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1845	CFClient::UI::set_layout ($::CFG->{layout});	1950	CFPlus::UI::set_layout ($::CFG->{layout});
1846		1951
1847	my %DEF_CFG = (	1952	my %DEF_CFG = (
1848	sdl_mode => 0,	1953	sdl_mode => 0,
1849	width => 640,	1954	width => 640,
1850	height => 480,	1955	height => 480,
1851	fullscreen => 0,	1956	fullscreen => 0,
1852	fast => 0,	1957	fast => 0,
1853	map_scale => 1,	1958	map_scale => 1,
1854	fow_enable => 1,	1959	fow_enable => 1,
1855	fow_intensity => 0.45,	1960	fow_intensity => 0.45,
1856	fow_smooth => 0,	1961	fow_smooth => 0,
1857	gui_fontsize => 1,	1962	gui_fontsize => 1,
1858	log_fontsize => 0.7,	1963	log_fontsize => 0.7,
1859	gauge_fontsize=> 1,	1964	gauge_fontsize => 1,
1860	gauge_size => 0.35,	1965	gauge_size => 0.35,
1861	stat_fontsize => 0.7,	1966	stat_fontsize => 0.7,
1862	mapsize => 100,	1967	mapsize => 100,
1863	host => "crossfire.schmorp.de",
1864	say_command => 'say',	1968	say_command => 'say',
1865	audio_enable => 1,	1969	audio_enable => 1,
1866	bgm_enable => 1,	1970	bgm_enable => 1,
1867	bgm_volume => 0.25,	1971	bgm_volume => 0.25,
1868	face_prefetch => 0,	1972	face_prefetch => 0,
1869	output_sync => 1,	1973	output_sync => 1,
1870	output_count => 1,	1974	output_count => 1,
1871	pickup => 0,	1975	pickup => 0,
		1976	inv_sort => "mtime",
		1977	default => "profile", # default profile
		1978	);
1872	);	1979
1873
1874	while (my ($k, $v) = each %DEF_CFG) {	1980	while (my ($k, $v) = each %DEF_CFG) {
1875	$CFG->{$k} = $v unless exists $CFG->{$k};	1981	$CFG->{$k} = $v unless exists $CFG->{$k};
1876	}	1982	}
1877		1983
		1984	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		1985
1878	sdl_init;	1986	sdl_init;
1879		1987
1880	@SDL_MODES = reverse	1988	@SDL_MODES = reverse
1881	grep $_->[0] >= 640 && $_->[1] >= 480,	1989	grep $_->[0] >= 640 && $_->[1] >= 480,
1882	CFClient::SDL_ListModes;	1990	CFPlus::SDL_ListModes;
1883		1991
1884	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1992	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1885		1993
1886	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1994	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1887		1995
1888	{	1996	{
1889	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1997	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1890	DejaVuSans.ttf	1998	DejaVuSans.ttf
1891	DejaVuSansMono.ttf	1999	DejaVuSansMono.ttf
1892	DejaVuSans-Bold.ttf	2000	DejaVuSans-Bold.ttf
1893	DejaVuSansMono-Bold.ttf	2001	DejaVuSansMono-Bold.ttf
1894	DejaVuSans-Oblique.ttf	2002	DejaVuSans-Oblique.ttf
1895	DejaVuSansMono-Oblique.ttf	2003	DejaVuSansMono-Oblique.ttf
1896	DejaVuSans-BoldOblique.ttf	2004	DejaVuSans-BoldOblique.ttf
1897	DejaVuSansMono-BoldOblique.ttf	2005	DejaVuSansMono-BoldOblique.ttf
1898	);	2006	);
1899		2007
1900	CFClient::add_font $_ for @fonts;	2008	CFPlus::add_font $_ for @fonts;
1901		2009
1902	CFClient::pango_init;	2010	CFPlus::pango_init;
1903		2011
1904	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2012	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1905	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2013	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1906		2014
1907	$FONT_PROP->make_default;	2015	$FONT_PROP->make_default;
1908	}	2016	}
1909		2017
1910	# compare mono (ft) vs. rgba (cairo)	2018	# compare mono (ft) vs. rgba (cairo)
1911	# ft - 1.8s, cairo 3s, even in alpha-only mode	2019	# ft - 1.8s, cairo 3s, even in alpha-only mode
1912	# for my $rgba (0..1) {	2020	# for my $rgba (0..1) {
1913	# my $t1 = Time::HiRes::time;	2021	# my $t1 = Time::HiRes::time;
1914	# for (1..1000) {	2022	# for (1..1000) {
1915	# my $layout = CFClient::Layout->new ($rgba);	2023	# my $layout = CFPlus::Layout->new ($rgba);
1916	# $layout->set_text ("hallo" x 100);	2024	# $layout->set_text ("hallo" x 100);
1917	# $layout->render;	2025	# $layout->render;
1918	# }	2026	# }
1919	# my $t2 = Time::HiRes::time;	2027	# my $t2 = Time::HiRes::time;
1920	# warn $t2-$t1;	2028	# warn $t2-$t1;
…		…
1923	video_init;	2031	video_init;
1924	audio_init;	2032	audio_init;
1925	}	2033	}
1926		2034
1927	Event::loop;	2035	Event::loop;
		2036	#CFPlus::SDL_Quit;
		2037	#CFPlus::_exit 0;
1928		2038
1929	END { CFClient::SDL_Quit }	2039	END { CFPlus::SDL_Quit }
1930		2040
1931	=head1 NAME	2041	=head1 NAME
1932		2042
1933	cfplus - A Crossfire+ and Crossfire game client	2043	cfplus - A Crossfire+ and Crossfire game client
1934		2044

Diff Legend

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