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.10 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.44 by elmex, Fri Jun 2 16:32:12 2006 UTC

…		…
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;	30	use Pod::POM;
31	use Event;	31	use Event;
32		32
33	use Crossfire;	33	use Crossfire;
34	use Crossfire::Protocol;	34	use Crossfire::Protocol::Constants;
35		35
36	use Compress::LZF;	36	use Compress::LZF;
37		37
38	use CFClient;	38	use CFClient;
39	use CFClient::OpenGL ();	39	use CFClient::OpenGL ();
		40	use CFClient::Protocol;
40	use CFClient::UI;	41	use CFClient::UI;
41	use CFClient::MapWidget;	42	use CFClient::MapWidget;
42		43
43	$Event::DIED = sub {	44	$Event::DIED = sub {
44	# TODO: display dialog box or so	45	# TODO: display dialog box or so
…		…
51		52
52	my $MAX_FPS = 60;	53	my $MAX_FPS = 60;
53	my $MIN_FPS = 5; # unused as of yet	54	my $MIN_FPS = 5; # unused as of yet
54		55
55	our $META_SERVER = "crossfire.real-time.com:13326";	56	our $META_SERVER = "crossfire.real-time.com:13326";
56
57	our $FACEMAP;
58	our $TILECACHE;
59	our $MAPCACHE;
60		57
61	our $LAST_REFRESH;	58	our $LAST_REFRESH;
62	our $NOW;	59	our $NOW;
63		60
64	our $CFG;	61	our $CFG;
…		…
84	our $LOGVIEW;	81	our $LOGVIEW;
85	our $CONSOLE;	82	our $CONSOLE;
86	our $METASERVER;	83	our $METASERVER;
87	our $LOGIN_BUTTON;	84	our $LOGIN_BUTTON;
88	our $QUIT_DIALOG;	85	our $QUIT_DIALOG;
		86	our $HOST_ENTRY;
		87	our $SERVER_SETUP;
89		88
90	our $FLOORBOX;	89	our $FLOORBOX;
91	our $GAUGES;	90	our $GAUGES;
92	our $STATWIDS;	91	our $STATWIDS;
93		92
…		…
100		99
101	our $ALT_ENTER_MESSAGE;	100	our $ALT_ENTER_MESSAGE;
102	our $STATUSBOX;	101	our $STATUSBOX;
103	our $DEBUG_STATUS;	102	our $DEBUG_STATUS;
104		103
105	our $INVWIN;	104	our $INV_WINDOW;
106	our $INV;	105	our $INV;
107	our $INVR;	106	our $INVR;
108	our $INVR_LBL;	107	our $INV_RIGHT_HB;
		108
		109	our $BIND_WINDOW;
		110	our $BIND_EDITOR;
		111
		112	our $SPELL_LIST;
		113	our $PICKUP_CFG;
109		114
110	sub status {	115	sub status {
111	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	116	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112	}	117	}
113		118
114	sub debug {	119	sub debug {
115	$DEBUG_STATUS->set_text ($_[0]);	120	$DEBUG_STATUS->set_text ($_[0]);
116	my ($w, $h) = $DEBUG_STATUS->size_request;
117	$DEBUG_STATUS->move ($WIDTH - $w, 0);
118	}	121	}
119		122
120	sub start_game {	123	sub start_game {
121	status "logging in...";	124	status "logging in...";
122		125
		126	$LOGIN_BUTTON->set_text ("Logout");
		127	$SERVER_SETUP->hide;
		128
123	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	129	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124		130
125	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";	131	my ($host, $port) = split /:/, $CFG->{host};
		132
126	$MAP = new CFClient::Map $mapsize, $mapsize;	133	$MAP = new CFClient::Map $mapsize, $mapsize;
127
128	my ($host, $port) = split /:/, $CFG->{host};
129		134
130	$CONN = eval {	135	$CONN = eval {
131	new conn	136	new CFClient::Protocol
132	host => $host,	137	host => $host,
133	port => $port || 13327,	138	port => $port || 13327,
134	user => $CFG->{user},	139	user => $CFG->{user},
135	pass => $CFG->{password},	140	pass => $CFG->{password},
136	mapw => $mapsize,	141	mapw => $mapsize,
137	maph => $mapsize,	142	maph => $mapsize,
138	;	143
		144	map_widget => $MAPWIDGET,
		145	logview => $LOGVIEW,
		146	statusbox => $STATUSBOX,
		147	map => $MAP,
		148	mapmap => $MAPMAP,
		149
		150	sound_play => sub {
		151	my ($x, $y, $soundnum, $type) = @_;
		152
		153	$SDL_MIXER
		154	or return;
		155
		156	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		157	or return;
		158
		159	$chunk->play;
		160	},
139	};	161	};
140		162
141	if ($CONN) {	163	if ($CONN) {
142	CFClient::lowdelay fileno $CONN->{fh};	164	CFClient::lowdelay fileno $CONN->{fh};
143		165
144	$LOGIN_BUTTON->set_text ("Logout");
145	status "login successful";	166	status "login successful";
146
147	$BUTTONBAR->{children}[1]->emit ("activate")
148	if $BUTTONBAR->{children}[1]->{state};
149
150	} else {	167	} else {
151	status "unable to connect";	168	status "unable to connect";
152	stop_game();	169	stop_game();
153	}	170	}
154	}	171	}
155		172
156	sub stop_game {	173	sub stop_game {
		174	$LOGIN_BUTTON->set_text ("Login");
		175	$SERVER_SETUP->show;
		176	$INV_WINDOW->hide;
		177	$LOGVIEW->hide;
		178
157	return unless $CONN;	179	return unless $CONN;
158		180
159	status "connection closed";	181	status "connection closed";
160	$LOGIN_BUTTON->set_text ("Login");	182
161	$CONN->destroy;	183	$CONN->destroy;
162	$CONN = 0; # false, does not autovivify	184	$CONN = 0; # false, does not autovivify
163
164	$BUTTONBAR->{children}[1]->emit ("activate")
165	unless $BUTTONBAR->{children}[1]->{state};
166
167	undef $MAPCACHE;
168	undef $MAP;
169	}	185	}
170		186
171	sub client_setup {	187	sub client_setup {
172	my $dialog = new CFClient::UI::FancyFrame	188	my $dialog = new CFClient::UI::FancyFrame
		189	x => 1,
		190	y => $HEIGHT * (1/8),
		191	name => "client_setup",
173	title => "Client Setup",	192	title => "Client Setup",
174	child => (my $vbox = new CFClient::UI::VBox);	193	child => (my $vbox = new CFClient::UI::VBox);
		194
175	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	195	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176		196
177	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	197	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
178	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	198	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179		199
180	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	200	$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]);
181	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	201	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182		202
183	$mode_slider->connect (changed => sub {	203	$mode_slider->connect (changed => sub {
184	my ($self, $value) = @_;	204	my ($self, $value) = @_;
185		205
…		…
192		212
193	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	213	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194	$table->add (1, $row++, new CFClient::UI::CheckBox	214	$table->add (1, $row++, new CFClient::UI::CheckBox
195	state => $CFG->{fullscreen},	215	state => $CFG->{fullscreen},
196	tooltip => "Bring the client into fullscreen mode.",	216	tooltip => "Bring the client into fullscreen mode.",
197	connect_changed => sub {	217	on_changed => sub {
198	my ($self, $value) = @_;	218	my ($self, $value) = @_;
199	$CFG->{fullscreen} = $value;	219	$CFG->{fullscreen} = $value;
200	}	220	}
201	);	221	);
202		222
203	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	223	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204	$table->add (1, $row++, new CFClient::UI::CheckBox	224	$table->add (1, $row++, new CFClient::UI::CheckBox
205	state => $CFG->{fast},	225	state => $CFG->{fast},
206	tooltip => "Lower the visual quality considerably to speed up rendering.",	226	tooltip => "Lower the visual quality considerably to speed up rendering.",
207	connect_changed => sub {	227	on_changed => sub {
208	my ($self, $value) = @_;	228	my ($self, $value) = @_;
209	$CFG->{fast} = $value;	229	$CFG->{fast} = $value;
210	}	230	}
211	);	231	);
212		232
213	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	233	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214	$table->add (1, $row++, new CFClient::UI::Slider	234	$table->add (1, $row++, new CFClient::UI::Slider
215	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	235	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	236	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217	connect_changed => sub {	237	on_changed => sub {
218	my ($self, $value) = @_;	238	my ($self, $value) = @_;
219	$CFG->{map_scale} = 2 ** $value;	239	$CFG->{map_scale} = 2 ** $value;
220	}	240	}
221	);	241	);
222		242
223	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	243	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
224	$table->add (1, $row++, new CFClient::UI::CheckBox	244	$table->add (1, $row++, new CFClient::UI::CheckBox
225	state => $CFG->{fow_enable},	245	state => $CFG->{fow_enable},
226	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	246	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227	connect_changed => sub {	247	on_changed => sub {
228	my ($self, $value) = @_;	248	my ($self, $value) = @_;
229	$CFG->{fow_enable} = $value;	249	$CFG->{fow_enable} = $value;
230	}	250	}
231	);	251	);
232		252
233	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	253	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234	$table->add (1, $row++, new CFClient::UI::Slider	254	$table->add (1, $row++, new CFClient::UI::Slider
235	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	255	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
236	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	256	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
237	connect_changed => sub {	257	on_changed => sub {
238	my ($self, $value) = @_;	258	my ($self, $value) = @_;
239	$CFG->{fow_intensity} = $value;	259	$CFG->{fow_intensity} = $value;
240	}	260	}
241	);	261	);
242		262
243	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	263	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244	$table->add (1, $row++, new CFClient::UI::CheckBox	264	$table->add (1, $row++, new CFClient::UI::CheckBox
245	state => $CFG->{fow_smooth},	265	state => $CFG->{fow_smooth},
246	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	266	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247	connect_changed => sub {	267	on_changed => sub {
248	my ($self, $value) = @_;	268	my ($self, $value) = @_;
249	$CFG->{fow_smooth} = $value;	269	$CFG->{fow_smooth} = $value;
250	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	270	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
251	}	271	}
252	);	272	);
253		273
254	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	274	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255	$table->add (1, $row++, new CFClient::UI::Slider	275	$table->add (1, $row++, new CFClient::UI::Slider
256	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	276	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
257	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	277	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
258	connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },	278	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
259	);	279	);
260		280
261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	281	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262	$table->add (1, $row++, new CFClient::UI::Slider	282	$table->add (1, $row++, new CFClient::UI::Slider
263	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	283	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
264	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	284	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
265	connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	285	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
266	);	286	);
267		287
268	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	288	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269		289
270	$table->add (1, $row++, new CFClient::UI::Slider	290	$table->add (1, $row++, new CFClient::UI::Slider
271	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	291	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
272	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	292	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273	connect_changed => sub {	293	on_changed => sub {
274	$CFG->{stat_fontsize} = $_[1];	294	$CFG->{stat_fontsize} = $_[1];
275	&set_stats_window_fontsize;	295	&set_stats_window_fontsize;
276	}	296	}
277	);	297	);
278		298
279	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	299	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280	$table->add (1, $row++, new CFClient::UI::Slider	300	$table->add (1, $row++, new CFClient::UI::Slider
281	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	301	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	302	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283	connect_changed => sub {	303	on_changed => sub {
284	$CFG->{gauge_fontsize} = $_[1];	304	$CFG->{gauge_fontsize} = $_[1];
285	&set_gauge_window_fontsize;	305	&set_gauge_window_fontsize;
286	}	306	}
287	);	307	);
288		308
289	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	309	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290	$table->add (1, $row++, new CFClient::UI::Slider	310	$table->add (1, $row++, new CFClient::UI::Slider
291	range => [$CFG->{gauge_size}, 0.2, 0.8],	311	range => [$CFG->{gauge_size}, 0.2, 0.8],
292	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	312	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293	connect_changed => sub {	313	on_changed => sub {
294	$CFG->{gauge_size} = $_[1];	314	$CFG->{gauge_size} = $_[1];
295	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	315	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
296	}	316	}
297	);	317	);
298		318
299	$table->add (1, $row++, new CFClient::UI::Button	319	$table->add (1, $row++, new CFClient::UI::Button
300	expand => 1, align => 0, text => "Apply",	320	expand => 1, align => 0, text => "Apply",
301	tooltip => "Apply the video settings",	321	tooltip => "Apply the video settings",
302	connect_activate => sub {	322	on_activate => sub {
303	video_shutdown ();	323	video_shutdown ();
304	video_init ();	324	video_init ();
305	}	325	}
306	);	326	);
307		327
308	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	328	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309	$table->add (1, $row++, new CFClient::UI::CheckBox	329	$table->add (1, $row++, new CFClient::UI::CheckBox
310	state => $CFG->{audio_enable},	330	state => $CFG->{audio_enable},
311	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.",	331	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.",
312	connect_changed => sub {	332	on_changed => sub {
313	$CFG->{audio_enable} = $_[1];	333	$CFG->{audio_enable} = $_[1];
314	}	334	}
315	);	335	);
316	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	336	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
317	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	337	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318	# $CFG->{effects_volume} = $_[1];	338	# $CFG->{effects_volume} = $_[1];
319	# });	339	# });
320	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	340	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
321	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	341	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322	$hbox->add (new CFClient::UI::CheckBox	342	$hbox->add (new CFClient::UI::CheckBox
323	expand => 1, state => $CFG->{bgm_enable},	343	expand => 1, state => $CFG->{bgm_enable},
324	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	344	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325	connect_changed => sub {	345	on_changed => sub {
326	$CFG->{bgm_enable} = $_[1];	346	$CFG->{bgm_enable} = $_[1];
327	}	347	}
328	);	348	);
329	$hbox->add (new CFClient::UI::Slider	349	$hbox->add (new CFClient::UI::Slider
330	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	350	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331	tooltip => "The volume of the background music. Changes are instant.",	351	tooltip => "The volume of the background music. Changes are instant.",
332	connect_changed => sub {	352	on_changed => sub {
333	$CFG->{bgm_volume} = $_[1];	353	$CFG->{bgm_volume} = $_[1];
334	CFClient::MixMusic::volume $_[1] * 128;	354	CFClient::MixMusic::volume $_[1] * 128;
335	}	355	}
336	);	356	);
337		357
338	$table->add (1, $row++, new CFClient::UI::Button	358	$table->add (1, $row++, new CFClient::UI::Button
339	expand => 1, align => 0, text => "Apply",	359	expand => 1, align => 0, text => "Apply",
340	tooltip => "Apply the audio settings",	360	tooltip => "Apply the audio settings",
341	connect_activate => sub {	361	on_activate => sub {
342	audio_shutdown ();	362	audio_shutdown ();
343	audio_init ();	363	audio_init ();
344	}	364	}
345	);	365	);
346		366
…		…
348	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry	368	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349	text => $CFG->{say_command},	369	text => $CFG->{say_command},
350	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. "	370	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. "
351	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	371	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	372	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353	connect_changed => sub {	373	on_changed => sub {
354	my ($self, $value) = @_;	374	my ($self, $value) = @_;
355	$CFG->{say_command} = $value;	375	$CFG->{say_command} = $value;
356	}	376	}
357	);	377	);
358		378
…		…
373		393
374	sub make_gauge_window {	394	sub make_gauge_window {
375	my $gh = int $HEIGHT * $CFG->{gauge_size};	395	my $gh = int $HEIGHT * $CFG->{gauge_size};
376		396
377	my $win = new CFClient::UI::Frame (	397	my $win = new CFClient::UI::Frame (
378	req_y => -1,	398	force_x => 0,
		399	force_y => "max",
379	user_w => $WIDTH,	400	force_w => $WIDTH,
380	user_h => $gh,	401	force_h => $gh,
381	);	402	);
382		403
383	$win->add (my $hbox = new CFClient::UI::HBox	404	$win->add (my $hbox = new CFClient::UI::HBox
384	children => [	405	children => [
385	(new CFClient::UI::HBox expand => 1),	406	(new CFClient::UI::HBox expand => 1),
…		…
421	&set_gauge_window_fontsize;	442	&set_gauge_window_fontsize;
422		443
423	$win	444	$win
424	}	445	}
425		446
		447
426	sub make_stats_window {	448	sub make_stats_window {
427	my $tgw = new CFClient::UI::FancyFrame title => "Stats";	449	my $tgw = new CFClient::UI::FancyFrame
		450	y => $HEIGHT * (2/8),
		451	x => "max",
		452	title => "Stats",
		453	name => "stats_window";
428		454
429	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	455	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
430	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	456	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431	can_hover => 1, can_events => 1,	457	can_hover => 1, can_events => 1,
432	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	458	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
435	tooltip => "The map you are currently on (if supported by the server).");	461	tooltip => "The map you are currently on (if supported by the server).");
436		462
437	$vb->add (my $hb0 = new CFClient::UI::HBox);	463	$vb->add (my $hb0 = new CFClient::UI::HBox);
438	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	464	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
439	can_hover => 1, can_events => 1,	465	can_hover => 1, can_events => 1,
440	tooltip => "This is the amount the Player weights.");	466	tooltip => "The weight of the player including all inventory items.");
441	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	467	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
442	can_hover => 1, can_events => 1,	468	can_hover => 1, can_events => 1,
443	tooltip => "The weight limit, you can't carry more than this.");	469	tooltip => "The weight limit: you cannot carry more than this.");
444		470
445		471
446	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	472	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
447	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	473	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
448		474
…		…
538	}	564	}
539		565
540	sub update_stats_window {	566	sub update_stats_window {
541	my ($stats) = @_;	567	my ($stats) = @_;
542		568
543	# i love text protocols!!!	569	# I love text protocols...
		570
544	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;	571	my $hp = $stats->{+CS_STAT_HP} * 1;
545	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;	572	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
546	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;	573	my $sp = $stats->{+CS_STAT_SP} * 1;
547	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;	574	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
548	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;	575	my $fo = $stats->{+CS_STAT_FOOD} * 1;
549	my $fo_m = 999;	576	my $fo_m = 999;
550	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;	577	my $gr = $stats->{+CS_STAT_GRACE} * 1;
551	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;	578	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
552		579
553	$GAUGES->{hp} ->set_value ($hp, $hp_m);	580	$GAUGES->{hp} ->set_value ($hp, $hp_m);
554	$GAUGES->{mana} ->set_value ($sp, $sp_m);	581	$GAUGES->{mana} ->set_value ($sp, $sp_m);
555	$GAUGES->{food} ->set_value ($fo, $fo_m);	582	$GAUGES->{food} ->set_value ($fo, $fo_m);
556	$GAUGES->{grace} ->set_value ($gr, $gr_m);	583	$GAUGES->{grace} ->set_value ($gr, $gr_m);
557	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})	584	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
558	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");	585	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
559	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};	586	my $rng = $stats->{+CS_STAT_RANGE};
560	$rng =~ s/^Range: //; # thank you so much dear server	587	$rng =~ s/^Range: //; # thank you so much dear server
561	$GAUGES->{range} ->set_text ("Rng: " . $rng);	588	$GAUGES->{range} ->set_text ("Rng: " . $rng);
562	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};	589	my $title = $stats->{+CS_STAT_TITLE};
563	$title =~ s/^Player: //;	590	$title =~ s/^Player: //;
564	$STATWIDS->{title} ->set_text ("Title: " . $title);	591	$STATWIDS->{title} ->set_text ("Title: " . $title);
565		592
566	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	593	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
567	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	594	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
568	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	595	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
569	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	596	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
570	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	597	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
571	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	598	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
572	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	599	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
573	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	600	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
574	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	601	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
575	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	602	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
576	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	603	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
577	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});	604	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
578	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});	605	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
579		606
580	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000);	607	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
581		608
		609	# TODO: replace by CS_STAT_RES_xxx constants
582	my %tbl = (	610	my %tbl = (
583	phys => 100,	611	phys => 100,
584	magic => 101,	612	magic => 101,
585	fire => 102,	613	fire => 102,
586	elec => 103,	614	elec => 103,
…		…
595	tund => 112,	623	tund => 112,
596	fear => 113,	624	fear => 113,
597	depl => 113,	625	depl => 113,
598	deat => 115,	626	deat => 115,
599	holyw => 116,	627	holyw => 116,
600	blind => 117	628	blind => 117,
601	);	629	);
602		630
603	for (keys %tbl) {
604	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});	631	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
605	}	632	for keys %tbl;
606
607	}
608
609	sub metaserver_dialog {
610	my $dialog = new CFClient::UI::FancyFrame
611	title => "Server List",
612	child => (my $vbox = new CFClient::UI::VBox);
613
614	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
615
616	$dialog
617	}	633	}
618		634
619	my $METASERVER_ATIME;	635	my $METASERVER_ATIME;
620		636
621	sub update_metaserver {	637	sub update_metaserver {
622	my ($HOST) = @_;
623
624	return if $METASERVER_ATIME > time;	638	return if $METASERVER_ATIME > time;
625	$METASERVER_ATIME = time + 60;	639	$METASERVER_ATIME = time + 60;
626		640
627	my $table = $METASERVER->{table};	641	my $table = $METASERVER->{table};
628	$table->clear;	642	$table->clear;
…		…
679	$m = [$users, $host, $uptime, $version, $desc];	693	$m = [$users, $host, $uptime, $version, $desc];
680		694
681	$y++;	695	$y++;
682		696
683	$table->add (0, $y, new CFClient::UI::VBox children => [	697	$table->add (0, $y, new CFClient::UI::VBox children => [
684	(new CFClient::UI::Button text => "Use", connect_activate => sub {	698	(new CFClient::UI::Button text => "Use", on_activate => sub {
685	$HOST->set_text ($CFG->{host} = $host);	699	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		700	$METASERVER->toggle_visibility;
686	}),	701	}),
687	(new CFClient::UI::Empty expand => 1),	702	(new CFClient::UI::Empty expand => 1),
688	]);	703	]);
689		704
690	$table->add ($_ + 1, $y, new CFClient::UI::Label	705	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
693	}	708	}
694	}	709	}
695	});	710	});
696	}	711	}
697		712
		713	sub metaserver_dialog {
		714	my $dialog = new CFClient::UI::FancyFrame
		715	title => "Server List",
		716	name => 'metaserver_dialog',
		717	x => 'center',
		718	y => 'center',
		719	child => (my $vbox = new CFClient::UI::VBox),
		720	on_visibility_change => sub {
		721	update_metaserver if $_[1];
		722	},
		723	;
		724
		725	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		726
		727	$dialog
		728	}
		729
698	sub server_setup {	730	sub server_setup {
699	my $dialog = new CFClient::UI::FancyFrame	731	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		732	x => "center",
		733	y => "center",
		734	name => "server_setup",
700	title => "Server Setup",	735	title => "Server Setup",
701	child => (my $vbox = new CFClient::UI::VBox);	736	child => (my $vbox = new CFClient::UI::VBox),
702		737	;
		738
703	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	739	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
704	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	740	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
705		741
706	{	742	{
707	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	743	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
708		744
709	$vbox->add (	745	$vbox->add (
710	my $HOST = new CFClient::UI::Entry	746	$HOST_ENTRY = new CFClient::UI::Entry
711	expand => 1,	747	expand => 1,
712	text => $CFG->{host},	748	text => $CFG->{host},
713	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	749	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
714	connect_changed => sub {	750	on_changed => sub {
715	my ($self, $value) = @_;	751	my ($self, $value) = @_;
716	$CFG->{host} = $value;	752	$CFG->{host} = $value;
717	}	753	}
718	);	754	);
719		755
720	$METASERVER = metaserver_dialog;	756	$METASERVER = metaserver_dialog;
721		757
722	$vbox->add (new CFClient::UI::Flopper	758	$vbox->add (new CFClient::UI::Button
723	expand => 1,	759	expand => 1,
724	text => "Server List",	760	text => "Server List",
725	other => $METASERVER,	761	other => $METASERVER,
726	tooltip => "Show a list of available crossfire servers",	762	tooltip => "Show a list of available crossfire servers",
727	connect_open => sub {	763	on_activate => sub { $METASERVER->toggle_visibility },
728	update_metaserver $HOST;
729	}
730	);	764	);
731	}	765	}
732		766
733	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	767	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
734	$table->add (1, 4, new CFClient::UI::Entry	768	$table->add (1, 4, new CFClient::UI::Entry
735	text => $CFG->{user},	769	text => $CFG->{user},
736	tooltip => "The name of your character on the server",	770	tooltip => "The name of your character on the server",
737	connect_changed => sub {	771	on_changed => sub {
738	my ($self, $value) = @_;	772	my ($self, $value) = @_;
739	$CFG->{user} = $value;	773	$CFG->{user} = $value;
740	}	774	}
741	);	775	);
742		776
743	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	777	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
744	$table->add (1, 5, new CFClient::UI::Entry	778	$table->add (1, 5, new CFClient::UI::Entry
745	text => $CFG->{password},	779	text => $CFG->{password},
746	hidden => 1,	780	hidden => 1,
747	tooltip => "The password for your character",	781	tooltip => "The password for your character",
748	connect_changed => sub {	782	on_changed => sub {
749	my ($self, $value) = @_;	783	my ($self, $value) = @_;
750	$CFG->{password} = $value;	784	$CFG->{password} = $value;
751	}	785	}
752	);	786	);
753		787
754	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	788	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
755	$table->add (1, 7, new CFClient::UI::Slider	789	$table->add (1, 7, new CFClient::UI::Slider
756	req_w => 100,	790	force_w => 100,
757	range => [$CFG->{mapsize}, 10, 100, 0, 1],	791	range => [$CFG->{mapsize}, 10, 100, 0, 1],
758	tooltip => "This is the size of the portion of the map update the server sends you. "	792	tooltip => "This is the size of the portion of the map update the server sends you. "
759	. "If you set this to a high value you will be able to see further, "	793	. "If you set this to a high value you will be able to see further, "
760	. "but you also increase bandwidth requirements and latency. "	794	. "but you also increase bandwidth requirements and latency. "
761	. "This option is only used once at log-in.",	795	. "This option is only used once at log-in.",
762	connect_changed => sub {	796	on_changed => sub {
763	my ($self, $value) = @_;	797	my ($self, $value) = @_;
764		798
765	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	799	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
766	},	800	},
767	);	801	);
…		…
774	. "This might increase or create lag, but increases the chances "	808	. "This might increase or create lag, but increases the chances "
775	. "of faces being ready for display when you encounter them. "	809	. "of faces being ready for display when you encounter them. "
776	. "It also uses up server bandwidth on every connect, "	810	. "It also uses up server bandwidth on every connect, "
777	. "so only set it if you really need to prefetch images. "	811	. "so only set it if you really need to prefetch images. "
778	. "This option can be set and unset any time.",	812	. "This option can be set and unset any time.",
779	connect_changed => sub { $CFG->{face_prefetch} = $_[1] },	813	on_changed => sub { $CFG->{face_prefetch} = $_[1] },
780	);	814	);
781		815
782	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	816	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
783	$table->add (1, 9, new CFClient::UI::Entry	817	$table->add (1, 9, new CFClient::UI::Entry
784	text => $CFG->{output_count},	818	text => $CFG->{output_count},
785	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	819	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
786	connect_changed => sub { $CFG->{output_count} = $_[1] },	820	on_changed => sub { $CFG->{output_count} = $_[1] },
787	);	821	);
788		822
789	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	823	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
790	$table->add (1, 10, new CFClient::UI::Entry	824	$table->add (1, 10, new CFClient::UI::Entry
791	text => $CFG->{output_sync},	825	text => $CFG->{output_sync},
792	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	826	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
793	connect_changed => sub { $CFG->{output_sync} = $_[1] },	827	on_changed => sub { $CFG->{output_sync} = $_[1] },
794	);	828	);
795		829
796	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	830	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
797	expand => 1,	831	expand => 1,
798	align => 0,	832	align => 0,
799	text => "Login",	833	text => "Login",
800	connect_activate => sub {	834	on_activate => sub {
801	$CONN ? stop_game	835	$CONN ? stop_game
802	: start_game;	836	: start_game;
803	},	837	},
804	);	838	);
805		839
806	$dialog	840	$dialog
807	}	841	}
808		842
809	sub message_window {	843	sub message_window {
810	my $window = new CFClient::UI::FancyFrame	844	my $window = new CFClient::UI::FancyFrame
		845	name => "message_window",
811	title => "Messages",	846	title => "Messages",
812	border_bg => [1, 1, 1, 1],	847	border_bg => [1, 1, 1, 1],
813	bg => [0, 0, 0, 0.75],	848	bg => [0, 0, 0, 0.75],
		849	x => "max",
		850	y => 0,
814	user_w => int $::WIDTH / 3,	851	force_w => $::WIDTH / 3,
815	user_h => int $::HEIGHT / 5,	852	force_h => $::HEIGHT / 5,
816	child => (my $vbox = new CFClient::UI::VBox);	853	child => (my $vbox = new CFClient::UI::VBox);
817		854
818	$vbox->add ($LOGVIEW);	855	$vbox->add ($LOGVIEW);
819		856
820	$vbox->add (my $input = new CFClient::UI::Entry	857	$vbox->add (my $input = new CFClient::UI::Entry
821	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	858	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
822	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	859	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
823	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	860	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
824	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	861	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
825	connect_focus_in => sub {	862	on_focus_in => sub {
826	my ($input, $prev_focus) = @_;	863	my ($input, $prev_focus) = @_;
827		864
828	delete $input->{refocus_map};	865	delete $input->{refocus_map};
829		866
830	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	867	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
831	$input->{refocus_map} = 1;	868	$input->{refocus_map} = 1;
832	}	869	}
833	delete $input->{auto_activated};	870	delete $input->{auto_activated};
834	},	871	},
835	connect_activate => sub {	872	on_activate => sub {
836	my ($input, $text) = @_;	873	my ($input, $text) = @_;
837	$input->set_text ('');	874	$input->set_text ('');
838		875
		876	if ($text =~ /^\/bind\s+(.*)$/) {
		877	CFClient::Binder::open_binding_dialog (sub {
		878	my ($mod, $sym) = @_;
		879	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		880	});
839	if ($text =~ /^\/(.*)/) {	881	} elsif ($text =~ /^\/(.*)/) {
840	$::CONN->user_send ($1);	882	$::CONN->user_send ($1);
841	} else {	883	} else {
842	my $say_cmd = $::CFG->{say_command} || 'say';	884	my $say_cmd = $::CFG->{say_command} || 'say';
843	$::CONN->user_send ("$say_cmd $text");	885	$::CONN->user_send ("$say_cmd $text");
844	}	886	}
845	if ($input->{refocus_map}) {	887	if ($input->{refocus_map}) {
846	delete $input->{refocus_map};	888	delete $input->{refocus_map};
847	$MAPWIDGET->focus_in	889	$MAPWIDGET->focus_in
848	}	890	}
849	},	891	},
850	connect_escape => sub {	892	on_escape => sub {
851	$MAPWIDGET->focus_in	893	$MAPWIDGET->focus_in
852	},	894	},
853	);	895	);
854		896
855	$CONSOLE = {	897	$CONSOLE = {
856	window => $window,	898	window => $window,
857	input => $input	899	input => $input,
858	};	900	};
859		901
860	$window	902	$window
861	}	903	}
862		904
863	sub open_quit_dialog {	905	sub open_quit_dialog {
864	unless ($QUIT_DIALOG) {	906	unless ($QUIT_DIALOG) {
865
866	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	907	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		908	x => "center",
		909	y => "center",
		910	title => "Really Quit?",
		911	;
867		912
868	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	913	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
869		914
870	$vb->add (new CFClient::UI::Label	915	$vb->add (new CFClient::UI::Label
871	text => "You should find a savebed and apply it first!",	916	text => "You should find a savebed and apply it first!",
…		…
874	);	919	);
875	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	920	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
876	$hb->add (new CFClient::UI::Button	921	$hb->add (new CFClient::UI::Button
877	text => "Ok",	922	text => "Ok",
878	expand => 1,	923	expand => 1,
879	connect_activate => sub { $QUIT_DIALOG->hide },	924	on_activate => sub { $QUIT_DIALOG->hide },
880	);	925	);
881	$hb->add (new CFClient::UI::Button	926	$hb->add (new CFClient::UI::Button
882	text => "Quit anyway",	927	text => "Quit anyway",
883	expand => 1,	928	expand => 1,
884	connect_activate => sub { exit },	929	on_activate => sub { exit },
885	);	930	);
		931	}
886		932
887	$QUIT_DIALOG->show_centered;	933	$QUIT_DIALOG->show;
		934	}
		935
		936	sub make_pickup_cfg_window {
		937	$PICKUP_CFG = new CFClient::UI::FancyFrame
		938	title => "Autopickup configuration",
		939	x => "center",
		940	y => "center",
		941	force_w => $WIDTH * 3/10,
		942	force_h => $HEIGHT * 9/10;
		943
		944	my $tbl = new CFClient::UI::Table;
		945	my $tblrow = 0;
		946
		947	$PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl, expand => 1);
		948
		949	for (
		950	["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE],
		951	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		952	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		953	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		954	["Weapons"],
		955	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		956	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		957	["Bows" => CFClient::Pickup::PU_BOW],
		958	["Arrows" => CFClient::Pickup::PU_ARROW],
		959	["Armour"],
		960	["Helmets" => CFClient::Pickup::PU_HELMET],
		961	["Shields" => CFClient::Pickup::PU_SHIELD],
		962	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		963	["Boots" => CFClient::Pickup::PU_BOOTS],
		964	["Gloves" => CFClient::Pickup::PU_GLOVES],
		965	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		966	["Readables"],
		967	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		968	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		969	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		970	["Misc"],
		971	["Food" => CFClient::Pickup::PU_FOOD],
		972	["Drinks" => CFClient::Pickup::PU_DRINK],
		973	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		974	["Keys" => CFClient::Pickup::PU_KEY],
		975	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		976	["Potions" => CFClient::Pickup::PU_POTION],
		977	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		978	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		979	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		980	)
		981	{
		982	unless (defined $_->[1]) {
		983	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0);
888	} else {	984	} else {
889	$QUIT_DIALOG->show_centered;	985	my $mask = $_->[1];
		986	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1);
		987	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
		988	state => $CFG->{pickup} & $mask,
		989	on_changed => sub {
		990	my ($box, $value) = @_;
		991	if ($value) {
		992	$CFG->{pickup} |= $mask;
		993	} else {
		994	$CFG->{pickup} = $CFG->{pickup} & ~$mask;
		995	}
		996	$::CONN->send (sprintf "command pickup %u", $CFG->{pickup});
		997	});
		998	}
890	}	999	}
		1000
		1001	$PICKUP_CFG
891	}	1002	}
892		1003
893	sub make_inventory_window {	1004	sub make_inventory_window {
894	my $invwin = new CFClient::UI::FancyFrame	1005	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
895	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";	1006	x => "center",
		1007	y => "center",
		1008	force_w => $WIDTH * 9/10,
		1009	force_h => $HEIGHT * 9/10,
		1010	title => "Inventory",
		1011	;
896		1012
897	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	1013	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
898		1014
899	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1015	$hb->add (my $vb1 = new CFClient::UI::VBox);
900	$vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);	1016	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
901	$lbl->set_text ("Player");
902	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1017	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
903		1018
904	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	1019	$hb->add (my $vb2 = new CFClient::UI::VBox);
		1020
905	$vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);	1021	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
906	$INVR_LBL->set_text ("Floor");	1022
907	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1023	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
908		1024
		1025	# XXX: Call after $INVR = ... because set_opencont sets the items
		1026	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1027
909	$invwin	1028	$invwin
		1029	}
		1030
		1031	sub make_spell_list {
		1032	$SPELL_LIST = new CFClient::UI::SpellList
		1033	force_w => $WIDTH * (9/10),
		1034	force_h => $HEIGHT * (9/10);
		1035	$SPELL_LIST
		1036	}
		1037
		1038	sub make_binding_window {
		1039	my $binding_list = new CFClient::UI::VBox;
		1040
		1041	my $refresh;
		1042	$refresh = sub {
		1043	$binding_list->clear ();
		1044
		1045	for my $mod (keys %{$::CFG->{bindings}}) {
		1046	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1047	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1048	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1049
		1050	my $lbl = join "; ", @$cmds;
		1051	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1052	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1053	$hb->add (new CFClient::UI::Button
		1054	text => "delete",
		1055	tooltip => "Deletes the binding",
		1056	on_activate => sub {
		1057	$binding_list->remove ($hb);
		1058	delete $::CFG->{bindings}->{$mod}->{$sym};
		1059	});
		1060
		1061	$hb->add (new CFClient::UI::Button
		1062	text => "edit",
		1063	tooltip => "Edits the binding",
		1064	on_activate => sub {
		1065	$::BIND_EDITOR->set_binding (
		1066	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1067	sub {
		1068	my ($nmod, $nsym, $ncmds) = @_;
		1069	delete $::CFG->{bindings}->{$mod}->{$sym};
		1070	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1071	$refresh->();
		1072	$::BIND_WINDOW->show;
		1073	},
		1074	sub {
		1075	$::BIND_WINDOW->show;
		1076	});
		1077	$::BIND_EDITOR->show;
		1078	$::BIND_WINDOW->hide;
		1079	});
		1080
		1081	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1082	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1083	}
		1084	}
		1085	};
		1086
		1087	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1088	title => "Bindings",
		1089	x => "center",
		1090	y => "center",
		1091	def_w => int $WIDTH * 9/10,
		1092	def_h => int $HEIGHT * 9/10,
		1093	on_visibility_change => sub {
		1094	my ($self, $visible) = @_;
		1095	$refresh->() if $visible;
		1096	};
		1097
		1098	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1099	$vb->add ($binding_list);
		1100	$vb->add (my $hb = new CFClient::UI::HBox);
		1101	$hb->add (new CFClient::UI::Button
		1102	text => "record new",
		1103	expand => 1,
		1104	tooltip => "This button opens the binding editor with an empty binding.",
		1105	on_activate => sub {
		1106	$::BIND_EDITOR->set_binding (undef, undef, [],
		1107	sub {
		1108	my ($mod, $sym, $cmds) = @_;
		1109	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1110	$refresh->();
		1111	$::BIND_WINDOW->show;
		1112	},
		1113	sub {
		1114	$::BIND_WINDOW->show;
		1115	});
		1116	$::BIND_WINDOW->hide;
		1117	$::BIND_EDITOR->show;
		1118	},
		1119	);
		1120	$hb->add (new CFClient::UI::Button
		1121	text => "close",
		1122	tooltip => "Closes the binding window",
		1123	expand => 1,
		1124	on_activate => sub {
		1125	$::BIND_WINDOW->hide;
		1126	}
		1127	);
		1128
		1129	$refresh->();
		1130	$BIND_WINDOW
910	}	1131	}
911		1132
912	sub make_help_window {	1133	sub make_help_window {
913	my $win = new CFClient::UI::FancyFrame	1134	my $win = new CFClient::UI::FancyFrame
914	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1135	x => 'center',
		1136	y => 'center',
		1137	name => 'doc_browser',
		1138	force_w => int $WIDTH * 7/8,
		1139	force_h => int $HEIGHT * 7/8,
		1140	title => "Documentation";
915		1141
916	$win->add (my $vbox = new CFClient::UI::VBox);	1142	$win->add (my $vbox = new CFClient::UI::VBox);
917		1143
918	$vbox->add (my $buttons = new CFClient::UI::HBox);	1144	$vbox->add (my $buttons = new CFClient::UI::HBox);
919	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1145	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
926	) {	1152	) {
927	my ($pod, $label) = @$_;	1153	my ($pod, $label) = @$_;
928		1154
929	$buttons->add (new CFClient::UI::Button	1155	$buttons->add (new CFClient::UI::Button
930	text => $label,	1156	text => $label,
931	connect_activate => sub {	1157	on_activate => sub {
932	my $parser = new Pod::POM;	1158	my $parser = new Pod::POM;
933	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1159	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
934		1160
935	$viewer->clear;	1161	$viewer->clear;
936		1162
…		…
980	if ($DEBUG_STATUS) {	1206	if ($DEBUG_STATUS) {
981	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1207	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
982	} else {	1208	} else {
983	# create the widgets	1209	# create the widgets
984		1210
985	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1211	$DEBUG_STATUS = new CFClient::UI::Label
		1212	padding => 0,
		1213	z => 100,
		1214	force_x => "max",
		1215	force_y => 0;
986	$DEBUG_STATUS->show;	1216	$DEBUG_STATUS->show;
987		1217
		1218	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1219
988	$STATUSBOX = new CFClient::UI::Statusbox;	1220	$STATUSBOX = new CFClient::UI::Statusbox;
989	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1221	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
990		1222
991	(new CFClient::UI::Frame	1223	(new CFClient::UI::Frame
992	bg => [0, 0, 0, 0.4],	1224	bg => [0, 0, 0, 0.4],
993	req_y => -1,	1225	force_x => 0,
		1226	force_y => "max",
994	child => $STATUSBOX,	1227	child => $STATUSBOX,
995	)->show;	1228	)->show;
996		1229
997	CFClient::UI::FancyFrame->new (	1230	CFClient::UI::FancyFrame->new (
		1231	title => "Mini Map",
		1232	name => "mapmap",
		1233	x => 0,
		1234	y => $FONTSIZE + 8,
998	border_bg => [1, 1, 1, 192/255],	1235	border_bg => [1, 1, 1, 192/255],
999	bg => [1, 1, 1, 0],	1236	bg => [1, 1, 1, 0],
1000	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1237	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1001	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1238	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1002	),	1239	),
…		…
1025	can_hover => 1,	1262	can_hover => 1,
1026	can_events => 1,	1263	can_events => 1,
1027	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1264	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1028	;	1265	;
1029		1266
1030	$BUTTONBAR = new CFClient::UI::HBox;	1267	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1031		1268
1032	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1269	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1033	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1270	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1034	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1271	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1035	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1272	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1039	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	1276	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
1040		1277
1041	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1278	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1042	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1279	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1043	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1280	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1044	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1281	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1282	."You can also hit the Tab-key to show/hide the Inventory.");
1045		1283
1046	$BUTTONBAR->add (new CFClient::UI::Button	1284	$BUTTONBAR->add (new CFClient::UI::Button
1047	text => "Save Config",	1285	text => "Save Config",
1048	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1286	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1049	connect_activate => sub {	1287	on_activate => sub {
		1288	$::CFG->{layout} = CFClient::UI::get_layout;
1050	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1289	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1051	status "Configuration Saved";	1290	status "Configuration Saved";
1052	},	1291	},
1053	);	1292	);
1054		1293
1055	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1294	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1056	tooltip => "View Documentation");	1295	tooltip => "View Documentation");
1057		1296
		1297	$BUTTONBAR->add (new CFClient::UI::Flopper
		1298	text => "Bindings",
		1299	other => make_binding_window,
		1300	tooltip =>
		1301	"Lets you define, edit and delete bindings."
		1302	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1303	."with nothing set and the recording started. After doing the actions you "
		1304	."want to record press Insert and you will be asked to press a key-combo."
		1305	."After pressing the combo the binding will be saved automatically and the "
		1306	."binding editor closes");
		1307
		1308	$BUTTONBAR->add (new CFClient::UI::Flopper
		1309	text => "Spells",
		1310	other => make_spell_list,
		1311	tooltip => "The spell list");
		1312
		1313	$BUTTONBAR->add (new CFClient::UI::Flopper
		1314	text => "Pickup",
		1315	other => make_pickup_cfg_window,
		1316	tooltip => "The pickup dialog");
		1317
		1318
1058	$BUTTONBAR->add (new CFClient::UI::Button	1319	$BUTTONBAR->add (new CFClient::UI::Button
1059	text => "Quit",	1320	text => "Quit",
1060	tooltip => "Terminates the program",	1321	tooltip => "Terminates the program",
1061	connect_activate => sub {	1322	on_activate => sub {
1062	if ($CONN) {	1323	if ($CONN) {
1063	open_quit_dialog;	1324	open_quit_dialog;
1064	} else {	1325	} else {
1065	exit;	1326	exit;
1066	}	1327	}
1067	},	1328	},
1068	);	1329	);
1069		1330
1070	$BUTTONBAR->show;	1331	$BUTTONBAR->show;
		1332	$SERVER_SETUP->show;
1071		1333
1072	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1334	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1073
1074	# delay till geometry is constant
1075	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1076	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1077	my $widget = $GAUGES->{win};
1078	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1079	});
1080	force_refresh ();
1081	}	1335	}
1082	}	1336	}
1083		1337
1084	sub video_shutdown {	1338	sub video_shutdown {
1085	undef $SDL_ACTIVE;	1339	undef $SDL_ACTIVE;
…		…
1153		1407
1154	my %demo;#d#	1408	my %demo;#d#
1155		1409
1156	sub force_refresh {	1410	sub force_refresh {
1157	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1411	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1158	debug sprintf "%3.2f", $fps;	1412	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1159		1413
1160	$CFClient::UI::ROOT->draw;	1414	$CFClient::UI::ROOT->draw;
1161		1415
1162	$WANT_REFRESH = 0;	1416	$WANT_REFRESH = 0;
1163	$CAN_REFRESH = 0;	1417	$CAN_REFRESH = 0;
…		…
1246	sub animation_stop {	1500	sub animation_stop {
1247	my ($widget) = @_;	1501	my ($widget) = @_;
1248	delete $animate_object{$widget};	1502	delete $animate_object{$widget};
1249	}	1503	}
1250		1504
1251	@conn::ISA = Crossfire::Protocol::;
1252
1253	sub conn::new {
1254	my $class = shift;
1255
1256	my $self = $class->Crossfire::Protocol::new (@_);
1257
1258	$MAPWIDGET->clr_commands;
1259
1260	my $parser = new Pod::POM;
1261	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1262
1263	for my $head2 ($pod->head1->[-2]->head2) {
1264	$head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1265	or next;
1266
1267	my $cmd = $1;
1268	my @args = split /\|/, $2;
1269	@args = (".*") unless @args;
1270
1271	my $text = CFClient::pod_to_pango $head2->content;
1272
1273	for my $arg (@args) {
1274	$arg = $arg eq ".*" ? "" : " $arg";
1275
1276	$MAPWIDGET->add_command ("$cmd$arg", $text);
1277	}
1278	}
1279
1280	$self->{noface} = new_from_file CFClient::Texture
1281	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1282
1283	$self->{open_container} = 0;
1284
1285	$self
1286	}
1287
1288	sub conn::stats_update {
1289	my ($self, $stats) = @_;
1290
1291	if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1292	my $diff = $exp - $self->{prev_exp};
1293	$STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1294	if exists $self->{prev_exp} && $diff;
1295	$self->{prev_exp} = $exp;
1296	}
1297
1298	update_stats_window ($stats);
1299	}
1300
1301	sub conn::user_send {
1302	my ($self, $command) = @_;
1303
1304	$self->send_command ($command);
1305	status $command;
1306	}
1307
1308	sub conn::map_scroll {
1309	my ($self, $dx, $dy) = @_;
1310
1311	$MAP->scroll ($dx, $dy);
1312	}
1313
1314	sub conn::feed_map1a {
1315	my ($self, $data) = @_;
1316
1317	# $self->Crossfire::Protocol::feed_map1a ($data);
1318
1319	$MAP->map1a_update ($data);
1320	$MAPWIDGET->update;
1321	}
1322
1323	sub conn::flush_map {
1324	my ($self) = @_;
1325
1326	my $map_info = delete $self->{map_info}
1327	or return;
1328
1329	my ($hash, $x, $y, $w, $h) = @$map_info;
1330
1331	my $data = $MAP->get_rect ($x, $y, $w, $h);
1332	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
1333	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1334	}
1335
1336	sub conn::map_clear {
1337	my ($self) = @_;
1338
1339	$self->flush_map;
1340	delete $self->{neigh_map};
1341
1342	$MAP->clear;
1343	}
1344
1345
1346	sub conn::load_map($$$) {
1347	my ($self, $hash, $x, $y) = @_;
1348
1349	if (defined (my $data = $MAPCACHE->get ($hash))) {
1350	$data = Compress::LZF::decompress $data;
1351	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1352	for my $id ($MAP->set_rect ($x, $y, $data)) {
1353	my $data = $TILECACHE->get ($id)
1354	or next;
1355
1356	$self->set_texture ($id => $data);
1357	}
1358	}
1359	}
1360
1361	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1362	# (server resource,s latency, bandwidth), so this hack is warranted.
1363	# the right fix is to make real tiled maps with an overview file
1364	sub conn::send_mapinfo {
1365	my ($self, $data, $cb) = @_;
1366
1367	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1368	my ($wx, $wy) = ($1, $2);
1369
1370	if ($data =~ /^spatial ([1-4]+)$/) {
1371	my @dx = (0, 0, 1, 0, -1);
1372	my @dy = (0, -1, 0, 1, 0);
1373	my ($dx, $dy);
1374
1375	for (split //, $1) {
1376	$dx += $dx[$_];
1377	$dy += $dy[$_];
1378	}
1379
1380	$cb->(spatial => 15,
1381	$self->{map_info}[1] - $MAP->ox + $dx * 50,
1382	$self->{map_info}[2] - $MAP->oy + $dy * 50,
1383	50, 50,
1384	sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1385	);
1386
1387	return;
1388	}
1389	}
1390
1391	$self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1392	}
1393
1394	# this method does a "flood fill" into every tile direction
1395	# it assumes that tiles are arranged in a rectangular grid,
1396	# i.e. a map is the same as the left of the right map etc.
1397	# failure to comply are harmless and result in display errors
1398	# at worst.
1399	sub conn::flood_fill {
1400	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1401
1402	# the server does not allow map paths > 6
1403	return if 7 <= length $path;
1404
1405	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1406
1407	for (
1408	[1, 3, 0, -1],
1409	[2, 4, 1, 0],
1410	[3, 1, 0, 1],
1411	[4, 2, -1, 0],
1412	) {
1413	my ($tile, $tile2, $dx, $dy) = @$_;
1414
1415	next if $block & (1 << $tile);
1416	my $block = $block | (1 << $tile2);
1417
1418	my $gx = $gx + $dx;
1419	my $gy = $gy + $dy;
1420
1421	next unless $flags & (1 << ($tile - 1));
1422	next if $self->{neigh_grid}{$gx, $gy}++;
1423
1424	my $neigh = $self->{neigh_map}{$hash} ||= [];
1425	if (my $info = $neigh->[$tile]) {
1426	my ($flags, $x, $y, $w, $h, $hash) = @$info;
1427
1428	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1429	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1430
1431	} else {
1432	$self->send_mapinfo ("spatial $path$tile", sub {
1433	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1434
1435	return if $mode ne "spatial";
1436
1437	$x += $MAP->ox;
1438	$y += $MAP->oy;
1439
1440	$self->load_map ($hash, $x, $y)
1441	unless $self->{neigh_map}{$hash}[5]++;#d#
1442
1443	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1444
1445	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1446	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1447	});
1448	}
1449	}
1450	}
1451
1452	sub conn::map_change {
1453	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1454
1455	$self->flush_map;
1456
1457	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1458
1459	my $mapmapw = $MAPMAP->{w};
1460	my $mapmaph = $MAPMAP->{h};
1461
1462	$self->{neigh_rect} = [
1463	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1464	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1465	];
1466
1467	delete $self->{neigh_grid};
1468
1469	$x += $ox;
1470	$y += $oy;
1471
1472	$self->{map_info} = [$hash, $x, $y, $w, $h];
1473
1474	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1475	$STATWIDS->{map}->set_text ("Map: " . $map);
1476
1477	$self->load_map ($hash, $x, $y);
1478	$self->flood_fill (0, 0, 0, "", $hash, $flags);
1479	}
1480
1481	sub conn::face_find {
1482	my ($self, $facenum, $face) = @_;
1483
1484	my $hash = "$face->{chksum},$face->{name}";
1485
1486	my $id = $FACEMAP->get ($hash);
1487
1488	unless ($id) {
1489	# create new id for face
1490	# I love transactions
1491	for (1..100) {
1492	my $txn = $CFClient::DB_ENV->txn_begin;
1493	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1494	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1495	$id = ($id || 16) + 1;
1496	if ($FACEMAP->put (id => $id) == 0
1497	&& $FACEMAP->put ($hash => $id) == 0) {
1498	$txn->txn_commit;
1499
1500	goto gotid;
1501	}
1502	}
1503	$txn->abort;
1504	}
1505
1506	CFClient::fatal "maximum number of transaction retries reached - database problems?";
1507	}
1508
1509	gotid:
1510	$face->{id} = $id;
1511	$MAP->set_face ($facenum => $id);
1512	$self->{faceid}[$facenum] = $id;#d#
1513
1514	my $face = $TILECACHE->get ($id);
1515
1516	if ($face) {
1517	#$self->face_prefetch;
1518	$face
1519	} else {
1520	my $tex = $self->{noface};
1521	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1522	undef
1523	};
1524	}
1525
1526	sub conn::face_update {
1527	my ($self, $facenum, $face) = @_;
1528
1529	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1530
1531	$self->set_texture ($face->{id} => delete $face->{image});
1532	}
1533
1534	sub conn::set_texture {
1535	my ($self, $id, $data) = @_;
1536
1537	$self->{texture}[$id] ||= do {
1538	my $tex =
1539	new_from_image CFClient::Texture
1540	$data, minify => 1, mipmap => 1;
1541
1542	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1543	$MAPWIDGET->update;
1544
1545	$tex
1546	};
1547	}
1548
1549	sub conn::sound_play {
1550	my ($self, $x, $y, $soundnum, $type) = @_;
1551
1552	$SDL_MIXER
1553	or return;
1554
1555	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1556	or return;
1557
1558	$chunk->play;
1559	# warn "sound $x,$y,$soundnum,$type\n";#d#
1560	}
1561
1562	my $LAST_QUERY; # server is stupid, stupid, stupid
1563
1564	sub conn::query {
1565	my ($self, $flags, $prompt) = @_;
1566
1567	$prompt = $LAST_QUERY unless length $prompt;
1568	$LAST_QUERY = $prompt;
1569
1570	my $dialog = new CFClient::UI::FancyFrame
1571	title => "Query",
1572	child => my $vbox = new CFClient::UI::VBox;
1573
1574	$vbox->add (new CFClient::UI::Label
1575	max_w => $::WIDTH * 0.4,
1576	ellipsise => 0,
1577	text => $prompt);
1578
1579	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1580	$vbox->add (my $hbox = new CFClient::HBox);
1581	$hbox->add (new CFClient::Button
1582	text => "No",
1583	connect_activate => sub {
1584	$self->send ("reply n");
1585	$dialog->destroy;
1586	$MAPWIDGET->focus_in;
1587	}
1588	);
1589	$hbox->add (new CFClient::Button
1590	text => "Yes",
1591	connect_activate => sub {
1592	$self->send ("reply y");
1593	$dialog->destroy;
1594	},
1595	);
1596
1597	$dialog->focus_in;
1598
1599	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1600	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1601	$vbox->add (my $entry = new CFClient::UI::Entry
1602	connect_changed => sub {
1603	$self->send ("reply $_[1]");
1604	$dialog->destroy;
1605	},
1606	);
1607
1608	$entry->focus_in;
1609
1610	} else {
1611	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1612
1613	$vbox->add (my $entry = new CFClient::UI::Entry
1614	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1615	connect_activate => sub {
1616	$self->send ("reply $_[1]");
1617	$dialog->destroy;
1618	},
1619	);
1620
1621	$entry->focus_in;
1622	}
1623
1624	$dialog->show_centered;
1625	}
1626
1627	sub conn::drawinfo {
1628	my ($self, $color, $text) = @_;
1629
1630	my @color = (
1631	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1632	[1.00, 1.00, 1.00],
1633	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1634	[1.00, 0.00, 0.00],
1635	[1.00, 0.54, 0.00],
1636	[0.11, 0.56, 1.00],
1637	[0.93, 0.46, 0.00],
1638	[0.18, 0.54, 0.34],
1639	[0.56, 0.73, 0.56],
1640	[0.80, 0.80, 0.80],
1641	[0.55, 0.41, 0.13],
1642	[0.99, 0.77, 0.26],
1643	[0.74, 0.65, 0.41],
1644	);
1645
1646	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1647
1648	$text = CFClient::UI::Label::escape $text;
1649	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1650	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1651
1652	$LOGVIEW->add_paragraph ($color[$color],
1653	join "\n", map "$time $_", split /\n/, $text);
1654
1655	$STATUSBOX->add ($text,
1656	group => $text,
1657	fg => $color[$color],
1658	timeout => 10,
1659	tooltip_font => $::FONT_FIXED,
1660	);
1661	}
1662
1663	sub conn::drawextinfo {
1664	my ($self, $color, $type, $subtype, $message) = @_;
1665
1666	$self->drawinfo ($color, $message);
1667	}
1668
1669	sub conn::spell_add {
1670	my ($self, $spell) = @_;
1671
1672	# TODO
1673	# create a widget dynamically, using spell face (CF::Protocol downloads them)
1674	$MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1675	$MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1676	}
1677
1678	sub conn::spell_delete {
1679	my ($self, $spell) = @_;
1680	}
1681
1682	sub conn::addme_success {
1683	my ($self) = @_;
1684
1685	$self->send ("command output-sync $CFG->{output_sync}");
1686	$self->send ("command output-count $CFG->{output_count}");
1687
1688	my $parser = new Pod::POM;
1689	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1690
1691	my %skill_tooltip;
1692
1693	for my $head2 ($pod->head1->[-2]->head2) {
1694	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1695	}
1696
1697	for my $skill (values %{$self->{skill_info}}) {
1698	$MAPWIDGET->add_command ("ready_skill $skill",
1699	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1700	. $skill_tooltip{$skill});
1701	$MAPWIDGET->add_command ("use_skill $skill",
1702	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1703	. $skill_tooltip{$skill});
1704	}
1705	}
1706
1707	sub conn::eof {
1708	$MAPWIDGET->clr_commands;
1709
1710	stop_game;
1711	}
1712
1713	sub conn::image_info {
1714	my ($self, $numfaces) = @_;
1715
1716	$self->{num_faces} = $numfaces;
1717	$self->{face_prefetch} = [1 .. $numfaces];
1718	$self->face_prefetch;
1719	}
1720
1721	sub conn::face_prefetch {
1722	my ($self) = @_;
1723
1724	return unless $CFG->{face_prefetch};
1725
1726	if ($self->{num_faces}) {
1727	return if @{ $self->{send_queue} || [] };
1728	my $todo = @{ $self->{face_prefetch} }
1729	or return;
1730
1731	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1732
1733	$self->send ("requestinfo image_sums $face $face");
1734
1735	$STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1736	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1737	} elsif (!exists $self->{num_faces}) {
1738	$self->send ("requestinfo image_info");
1739
1740	$self->{num_faces} = 0;
1741
1742	$STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1743	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1744	}
1745	}
1746
1747	# check once/second for faces that need to be prefetched	1505	# check once/second for faces that need to be prefetched
1748	# this should, of course, only run on demand, but	1506	# this should, of course, only run on demand, but
1749	# SDL forces worse things on us....	1507	# SDL forces worse things on us....
1750		1508
1751	Event->timer (after => 1, interval => 0.25, cb => sub {	1509	Event->timer (after => 1, interval => 0.25, cb => sub {
1752	$CONN->face_prefetch	1510	$CONN->face_prefetch
1753	if $CONN;	1511	if $CONN;
1754	});	1512	});
1755
1756	sub update_floorbox {
1757	$CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1758	return unless $CONN;
1759
1760	$FLOORBOX->clear;
1761
1762	my $row;
1763	for (@{ $CONN->{container}{0} }) {
1764	if ($row < 7) {
1765	local $_->{face_widget}; # hack to force recreation of widget
1766	local $_->{desc_widget}; # hack to force recreation of widget
1767	CFClient::Item::update_widgets $_;
1768
1769	$FLOORBOX->add (0, $row, $_->{face_widget});
1770	$FLOORBOX->add (1, $row, $_->{desc_widget});
1771
1772	$row++;
1773	} else {
1774	$FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");
1775	last;
1776	}
1777	}
1778	});
1779
1780	$WANT_REFRESH++;
1781	}
1782
1783	sub set_opencont {
1784	my ($conn, $tag, $name) = @_;
1785	$conn->{open_container} = $tag;
1786	$INVR_LBL->set_text ($name);
1787	$INVR->set_items ($conn->{container}{$tag});
1788	}
1789
1790	sub update_container {
1791	my ($tag) = @_;
1792	$INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1793	if $tag == $CONN->{open_container};
1794	}
1795
1796	sub conn::container_add {
1797	my ($self, $tag, $items) = @_;
1798
1799	#d# print "container_add: container $tag ($self->{player}{tag})\n";
1800
1801	if ($tag == 0) {
1802	update_floorbox;
1803	update_container (0);
1804	} elsif ($tag == $self->{player}{tag}) {
1805	$INV->set_items ($self->{container}{$self->{player}{tag}})
1806	} else {
1807	update_container ($tag);
1808	}
1809
1810	# $self-<{player}{tag} => player inv
1811	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1812	}
1813
1814	sub conn::container_clear {
1815	my ($self, $tag) = @_;
1816
1817	#d# print "container_clear: container $tag ($self->{player}{tag})\n";
1818
1819	if ($tag == 0) {
1820	update_floorbox;
1821	update_container (0);
1822	} elsif ($tag == $self->{player}{tag}) {
1823	$INV->set_items ($self->{container}{$tag})
1824	}
1825
1826	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1827	}
1828
1829	sub conn::item_delete {
1830	my ($self, @items) = @_;
1831
1832	for (@items) {
1833	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1834
1835	if ($_->{container} == 0) {
1836	update_floorbox;
1837	update_container ($_->{tag});
1838	} elsif ($_->{container} == $self->{player}{tag}) {
1839	$INV->set_items ($self->{container}{$self->{player}{tag}})
1840	} else {
1841	update_container ($_->{tag});
1842	}
1843	}
1844	}
1845
1846	sub conn::item_update {
1847	my ($self, $item) = @_;
1848
1849	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1850
1851	if ($item->{tag} == $self->{player}{tag}) {
1852	$STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1853	return
1854	}
1855
1856	CFClient::Item::update_widgets $item;
1857
1858	if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1859	set_opencont ($CONN, 0, "Floor");
1860
1861	} elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1862	set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1863	} else {
1864	if ($item->{container} == 0) {
1865	update_floorbox;
1866	update_container (0);
1867	} elsif ($item->{container} == $self->{player}{tag}) {
1868	$INV->set_items ($self->{container}{$item->{container}})
1869	}
1870	}
1871	}
1872		1513
1873	%SDL_CB = (	1514	%SDL_CB = (
1874	CFClient::SDL_QUIT => sub {	1515	CFClient::SDL_QUIT => sub {
1875	Event::unloop -1;	1516	Event::unloop -1;
1876	},	1517	},
…		…
1908	#############################################################################	1549	#############################################################################
1909		1550
1910	$SIG{INT} = $SIG{TERM} = sub { exit };	1551	$SIG{INT} = $SIG{TERM} = sub { exit };
1911		1552
1912	{	1553	{
1913	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1554	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1914		1555
1915	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1556	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1916		1557	CFClient::UI::set_layout ($::CFG->{layout});
1917	$TILECACHE = CFClient::db_table "tilecache";
1918	$FACEMAP = CFClient::db_table "facemap";
1919		1558
1920	my %DEF_CFG = (	1559	my %DEF_CFG = (
1921	sdl_mode => 0,	1560	sdl_mode => 0,
1922	width => 640,	1561	width => 640,
1923	height => 480,	1562	height => 480,
…		…
2000		1639
2001	END { CFClient::SDL_Quit }	1640	END { CFClient::SDL_Quit }
2002		1641
2003	=head1 NAME	1642	=head1 NAME
2004		1643
2005	pclient - A Crossfire+ and Crossfire game client	1644	cfplus - A Crossfire+ and Crossfire game client
2006		1645
2007	=head1 SYNOPSIS	1646	=head1 SYNOPSIS
2008		1647
2009	Just run it - no commandline arguments are supported.	1648	Just run it - no commandline arguments are supported.
2010		1649
2011	=head1 USAGE	1650	=head1 USAGE
2012		1651
2013	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1652	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2014	fullscreen and interactively.	1653	fullscreen and interactively.
2015		1654
		1655	=head1 DEBUGGING
		1656
		1657
		1658	CFPLUS_DEBUG - environment variable
		1659
		1660	1 draw borders around widgets
		1661	2 add low-level widget info to tooltips
		1662	4 show fps
		1663	8 suppress tooltips
		1664
2016	=head1 AUTHOR	1665	=head1 AUTHOR
2017		1666
2018	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1667	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2019		1668
2020		1669

Diff Legend

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