ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167
168	$widget->reconfigure;
169	}	190	}
		191
		192	reconfigure_widgets;
170	}	193	}
171		194
172	#############################################################################	195	#############################################################################
173		196
174	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
212	return if $self->{parent};	249	return if $self->{parent};
213		250
214	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
215	}	252	}
216		253
217	sub hide {	254	sub set_visible {
218	my ($self) = @_;	255	my ($self) = @_;
		256
		257	return if $self->{visible};
		258
		259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
		261
		262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
		270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
219		278
220	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
221	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
222		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
223	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
224	if $self->{parent};	313	if $self->{parent};
225	}	314	}
226		315
227	sub move {	316	sub move_abs {
228	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
229		318
230	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
231	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
232	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
233		322
234	$self->update;	323	$self->update;
235	}	324	}
236		325
237	sub set_size {	326	sub set_size {
238	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
239		328
240	$self->{user_w} = $w;	329	$self->{force_w} = $w;
241	$self->{user_h} = $h;	330	$self->{force_h} = $h;
242		331
243	$self->check_size;	332	$self->realloc;
244	}	333	}
245		334
246	sub size_request {	335	sub size_request {
247	require Carp;	336	require Carp;
248	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
250		339
251	sub configure {	340	sub configure {
252	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
253		342
254	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
255	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
256	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
257		348
258	# use alignment to adjust x, y	349	# use alignment to adjust x, y
259		350
260	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
261	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
262
263	($w, $h) = ($w2, $h2);
264	}	353	}
265		354
266	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
267	$self->{x} = $x;	356	$self->{x} = $x;
268	$self->{y} = $y;	357	$self->{y} = $y;
269	$self->update;	358	$self->update;
270	}	359	}
271		360
272	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
274	}	368	}
275	}	369	}
276		370
277	sub size_allocate {	371	sub size_allocate {
278	# nothing to be done	372	# nothing to be done
279	}	373	}
280		374
281	sub reconfigure {
282	my ($self) = @_;
283
284	$self->check_size (1);
285	$self->update;
286	}
287
288	sub children {	375	sub children {
289	}	376	}
290		377
291	sub set_max_size {	378	sub set_max_size {
292	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
295	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
296	}	383	}
297		384
298	sub set_tooltip {	385	sub set_tooltip {
299	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
300		392
301	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
302		394
303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
326	return if $FOCUS == $self;	418	return if $FOCUS == $self;
327	return unless $self->{can_focus};	419	return unless $self->{can_focus};
328		420
329	my $focus = $FOCUS; $FOCUS = $self;	421	my $focus = $FOCUS; $FOCUS = $self;
330		422
331	$self->emit (focus_in => $focus);	423	$self->_emit (focus_in => $focus);
332		424
333	$focus->update if $focus;	425	$focus->update if $focus;
334	$FOCUS->update;	426	$FOCUS->update;
335	}	427	}
336		428
…		…
339		431
340	return unless $FOCUS == $self;	432	return unless $FOCUS == $self;
341		433
342	my $focus = $FOCUS; undef $FOCUS;	434	my $focus = $FOCUS; undef $FOCUS;
343		435
344	$self->emit (focus_out => $focus);	436	$self->_emit (focus_out => $focus);
345		437
346	$focus->update if $focus; #?	438	$focus->update if $focus; #?
		439
		440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		441	unless $FOCUS;
347	}	442	}
348		443
349	sub mouse_motion { }	444	sub mouse_motion { }
350	sub button_up { }	445	sub button_up { }
351	sub key_down { }	446	sub key_down { }
352	sub key_up { }	447	sub key_up { }
353		448
354	sub button_down {	449	sub button_down {
355	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
356		451
357	$self->focus_in;	452	$self->focus_in;
358	}	453	}
359		454
360	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
361	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
362	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
363	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
364	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365		528
366	sub draw {	529	sub draw {
367	my ($self) = @_;	530	my ($self) = @_;
368		531
369	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370		543
371	glPushMatrix;	544	glPushMatrix;
372	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
373	$self->_draw;	546	$self->_draw;
374	glPopMatrix;	547	glPopMatrix;
…		…
386	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
387	glEnd;	560	glEnd;
388	glDisable GL_BLEND;	561	glDisable GL_BLEND;
389	}	562	}
390		563
391	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
392	glPushMatrix;	565	glPushMatrix;
393	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
394	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
396	glVertex 0 , 0;	569	glVertex 0 , 0;
397	glVertex $self->{w}, 0;	570	glVertex $self->{w} - 1, 0;
398	glVertex $self->{w}, $self->{h};	571	glVertex $self->{w} - 1, $self->{h} - 1;
399	glVertex 0 , $self->{h};	572	glVertex 0 , $self->{h} - 1;
400	glEnd;	573	glEnd;
401	glPopMatrix;	574	glPopMatrix;
402	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403	}	576	}
404	}	577	}
405		578
406	sub _draw {	579	sub _draw {
407	my ($self) = @_;	580	my ($self) = @_;
408		581
409	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
410	}
411
412	sub find_widget {
413	my ($self, $x, $y) = @_;
414
415	return () unless $self->{can_events};
416
417	return $self
418	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421	()
422	}
423
424	sub set_parent {
425	my ($self, $parent) = @_;
426
427	Scalar::Util::weaken ($self->{parent} = $parent);
428
429	# TODO: req_w _does_change after ->reconfigure
430	$self->check_size
431	unless exists $self->{req_w};
432	}
433
434	sub check_size {
435	my ($self, $forced) = @_;
436
437	$self->{force_alloc} = 1 if $forced;
438	$CFClient::UI::ROOT->{check_size}{$self} = $self;
439	}
440
441	sub update {
442	my ($self) = @_;
443
444	$self->{parent}->update
445	if $self->{parent};
446	}
447
448	sub connect {
449	my ($self, $signal, $cb) = @_;
450
451	push @{ $self->{signal_cb}{$signal} }, $cb;
452	}
453
454	sub emit {
455	my ($self, $signal, @args) = @_;
456
457	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458	}	583	}
459		584
460	sub DESTROY {	585	sub DESTROY {
461	my ($self) = @_;	586	my ($self) = @_;
462		587
…		…
520	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
521	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
522	}	647	}
523		648
524	sub size_request {	649	sub size_request {
525	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
526	}	653	}
527		654
528	sub draw { }	655	sub draw { }
529		656
530	#############################################################################	657	#############################################################################
…		…
559	$self->{children} = [	686	$self->{children} = [
560	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
561	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
562	];	689	];
563		690
564	$self->check_size (1);	691	$self->realloc;
565	$self->update;
566	}	692	}
567		693
568	sub children {	694	sub children {
569	@{ $_[0]{children} }	695	@{ $_[0]{children} }
570	}	696	}
…		…
575	delete $child->{parent};	701	delete $child->{parent};
576	$child->hide;	702	$child->hide;
577		703
578	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579		705
580	$self->check_size;	706	$self->realloc;
581	$self->update;
582	}	707	}
583		708
584	sub clear {	709	sub clear {
585	my ($self) = @_;	710	my ($self) = @_;
586		711
…		…
590	for (@$children) {	715	for (@$children) {
591	delete $_->{parent};	716	delete $_->{parent};
592	$_->hide;	717	$_->hide;
593	}	718	}
594		719
595	$self->check_size;	720	$self->realloc;
596	$self->update;
597	}	721	}
598		722
599	sub find_widget {	723	sub find_widget {
600	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
601		725
…		…
688	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
689	$self->update;	813	$self->update;
690	}	814	}
691		815
692	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
693	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
694	}	820	}
695		821
696	sub render_child {	822	sub render_child {
697	my ($self) = @_;	823	my ($self) = @_;
698		824
699	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
701	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
702		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
703	$self->_render;	836	$self->_render;
704	};	837	};
705	}	838	}
706		839
707	sub _draw {	840	sub _draw {
708	my ($self) = @_;	841	my ($self) = @_;
709		842
710	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
711		844
712	my $tex = $self->{texture}	845	my $tex = $self->{texture}
713	or return;	846	or return;
714		847
715	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
725		858
726	package CFClient::UI::ViewPort;	859	package CFClient::UI::ViewPort;
727		860
728	our @ISA = CFClient::UI::Window::;	861	our @ISA = CFClient::UI::Window::;
729		862
		863	sub new {
		864	my $class = shift;
		865
		866	$class->SUPER::new (
		867	scroll_x => 0,
		868	scroll_y => 1,
		869	@_,
		870	)
		871	}
		872
730	sub size_request {	873	sub size_request {
731	my ($self) = @_;	874	my ($self) = @_;
732		875
733	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
735		877
736	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
737	}	882	}
738		883
739	sub size_allocate {	884	sub size_allocate {
740	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
741		886
		887	my $child = $self->child;
		888
		889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		891
		892	$self->child->configure (0, 0, $w, $h);
742	$self->update;	893	$self->update;
743	}	894	}
744		895
745	sub set_offset {	896	sub set_offset {
746	my ($self, $x, $y) = @_;	897	my ($self, $x, $y) = @_;
…		…
780	}	931	}
781		932
782	sub _render {	933	sub _render {
783	my ($self) = @_;	934	my ($self) = @_;
784		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
785	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786		940
787	$self->SUPER::_render;	941	$self->SUPER::_render;
788	}	942	}
789		943
…		…
797	my $class = shift;	951	my $class = shift;
798		952
799	my $self;	953	my $self;
800		954
801	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
802	vertical => 1,	956	vertical => 1,
803	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
804	connect_changed => sub {	958	on_changed => sub {
805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	959	$self->{vp}->set_offset (0, $_[1]);
806	},	960	},
807	;	961	;
808		962
809	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
810	vp => (new CFClient::UI::ViewPort expand => 1),	964	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
815	$self->{vp}->add ($self->{scrolled});	969	$self->{vp}->add ($self->{scrolled});
816	$self->add ($self->{vp});	970	$self->add ($self->{vp});
817	$self->add ($self->{slider});	971	$self->add ($self->{slider});
818		972
819	$self	973	$self
		974	}
		975
		976	sub update {
		977	my ($self) = @_;
		978
		979	$self->SUPER::update;
		980
		981	# todo: overwrite size_allocate of child
		982	my $child = $self->{vp}->child;
		983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		984	}
		985
		986	sub size_allocate {
		987	my ($self, $w, $h) = @_;
		988
		989	$self->SUPER::size_allocate ($w, $h);
		990
		991	my $child = $self->{vp}->child;
		992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820	}	993	}
821		994
822	#TODO# update range on size_allocate depending on child	995	#TODO# update range on size_allocate depending on child
823	# update viewport offset on scroll	996	# update viewport offset on scroll
824		997
…		…
868		1041
869	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
870		1043
871	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
872		1045
873	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
874	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876		1053
877	sub new {	1054	sub new {
878	my $class = shift;	1055	my ($class, %arg) = @_;
879		1056
880	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
881		1058
882	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
883	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
884	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
885	border => 0.6,	1062	border => 0.6,
886	toplevel => 1,
887	can_events => 1,	1063	can_events => 1,
888	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
889	);	1067	);
890		1068
891	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
892	align => 0,	1070	align => 0,
893	valign => 1,	1071	valign => 1,
894	text => $self->{title},	1072	text => $title,
895	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
896		1075
897	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
898	}	1084	}
899		1085
900	sub border {	1086	sub border {
901	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
902	}	1088	}
903		1089
904	sub size_request {	1090	sub size_request {
905	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
906		1095
907	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
908		1097
909	(	1098	(
910	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
913	}	1102	}
914		1103
915	sub size_allocate {	1104	sub size_allocate {
916	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
917		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
918	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
919	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
920		1117
921	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922	if $self->{title};
923
924	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
925	}	1119	}
926		1120
927	sub button_down {	1121	sub button_down {
928	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
929		1123
…		…
945	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
946		1140
947	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
948	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
949		1143
950	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
952	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953	$self->check_size;
954	};	1149	};
955		1150
956	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
957	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
958	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
960	$self->{motion} = sub {	1155	$self->{motion} = sub {
961	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
962		1157
963	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
964		1159
965	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966	$self->update;
967	};	1161	};
968	}	1162	}
969	}	1163	}
970		1164
971	sub button_up {	1165	sub button_up {
…		…
981	}	1175	}
982		1176
983	sub _draw {	1177	sub _draw {
984	my ($self) = @_;	1178	my ($self) = @_;
985		1179
		1180	my $child = $self->{children}[0];
		1181
986	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
987	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
988		1184
989	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991		1187
992	my $border = $self->border;	1188	my $border = $self->border;
993		1189
994	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
995	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
996	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
997	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999		1195
1000	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1002		1198
1003	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1004	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1005	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1006
1007	glColor @{ $self->{bg} };
1008
1009	$bg->{s} = $rep_x;
1010	$bg->{t} = $rep_y;
1011	$bg->{wrap_mode} = 1;
1012	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013	}	1204	}
1014		1205
1015	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1016		1207
1017	$self->{title}->draw if $self->{title};
1018
1019	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1020	}	1214	}
1021		1215
1022	#############################################################################	1216	#############################################################################
1023		1217
1024	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1032	sub new {	1226	sub new {
1033	my $class = shift;	1227	my $class = shift;
1034		1228
1035	$class->SUPER::new (	1229	$class->SUPER::new (
1036	col_expand => [],	1230	col_expand => [],
1037	@_	1231	@_,
1038	)	1232	)
		1233	}
		1234
		1235	sub children {
		1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039	}	1237	}
1040		1238
1041	sub add {	1239	sub add {
1042	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1043		1241
1044	$child->set_parent ($self);	1242	$child->set_parent ($self);
1045	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1046		1244
1047	$child->check_size;	1245	$self->realloc;
1048	}	1246	}
1049		1247
1050	sub children {
1051	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052	}
1053
1054	# TODO: move to container class maybe? send childs a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1055	sub clear {	1249	sub clear {
1056	my ($self) = @_;	1250	my ($self) = @_;
1057		1251
1058	my @children = $self->children;	1252	my @children = $self->children;
1059	delete $self->{children};	1253	delete $self->{children};
…		…
1061	for (@children) {	1255	for (@children) {
1062	delete $_->{parent};	1256	delete $_->{parent};
1063	$_->hide;	1257	$_->hide;
1064	}	1258	}
1065		1259
1066	$self->update;	1260	$self->realloc;
1067	}	1261	}
1068		1262
1069	sub get_wh {	1263	sub get_wh {
1070	my ($self) = @_;	1264	my ($self) = @_;
1071		1265
…		…
1102	sub size_allocate {	1296	sub size_allocate {
1103	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
1104		1298
1105	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1106		1300
1107	my $req_w = sum @$ws;	1301	my $req_w = (sum @$ws) || 1;
1108	my $req_h = sum @$hs;	1302	my $req_h = (sum @$hs) || 1;
1109		1303
1110	# TODO: nicer code && do row_expand	1304	# TODO: nicer code && do row_expand
1111	my @col_expand = @{$self->{col_expand}};	1305	my @col_expand = @{$self->{col_expand}};
1112	@col_expand = (1) x @$ws unless @col_expand;	1306	@col_expand = (1) x @$ws unless @col_expand;
1113	my $col_expand = (sum @col_expand) || 1;	1307	my $col_expand = (sum @col_expand) || 1;
…		…
1167	}	1361	}
1168	}	1362	}
1169		1363
1170	#############################################################################	1364	#############################################################################
1171		1365
1172	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1173
1174	# TODO: wrap into common Box base class
1175		1367
1176	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1177		1369
1178	sub size_request {	1370	sub size_request {
1179	my ($self) = @_;	1371	my ($self) = @_;
1180		1372
1181	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1182		1374	? (
1183	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1184	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185	(List::Util::max map $_->[1], @alloc),	1377	)
1186	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1187	}	1382	}
1188		1383
1189	sub size_allocate {	1384	sub size_allocate {
1190	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1191		1386
1192	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1193
1194	my $children = $self->{children};	1388	my $children = $self->{children};
1195		1389
1196	my @h = map $_->{req_w}, @$children;	1390	my @req;
1197		1391
1198	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1199		1393	@req = ($space / (@$children || 1)) x @$children;
1200	if ($req_h > $h) {
1201	# ah well, not enough space
1202	$_ *= $h / $req_h for @h;
1203	} else {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1204	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205	$exp ||= 1;
1206		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1207	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1208	my $child = $children->[$_];
1209
1210	my $alloc_h = $h[$_];
1211	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212	$h[$_] = $alloc_h;
1213	}	1408	}
1214	}	1409	}
1215		1410
1216	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1217		1412
1218	my $y = 0;	1413	my $pos = 0;
1219	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1220	my $child = $children->[$_];
1221	my $h = $h[$_];	1415	my $alloc = $req[$_];
1222	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223		1417
1224	$y += $h;	1418	$pos += $alloc;
1225	}	1419	}
1226		1420
1227	1	1421	1
1228	}	1422	}
1229		1423
1230	#############################################################################	1424	#############################################################################
1231		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1232	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1233		1442
1234	# TODO: wrap into common Box base class
1235
1236	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1237		1444
1238	sub size_request {	1445	sub new {
1239	my ($self) = @_;	1446	my $class = shift;
1240		1447
1241	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1242		1449	vertical => 1,
1243	(	1450	@_,
1244	(List::Util::max map $_->[0], @alloc),
1245	(List::Util::sum map $_->[1], @alloc),
1246	)	1451	)
1247	}
1248
1249	sub size_allocate {
1250	my ($self, $w, $h) = @_;
1251
1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254	my $children = $self->{children};
1255
1256	my @h = map $_->{req_h}, @$children;
1257
1258	my $req_h = List::Util::sum @h;
1259
1260	if ($req_h > $h) {
1261	# ah well, not enough space
1262	$_ *= $h / $req_h for @h;
1263	} else {
1264	my $exp = List::Util::sum map $_->{expand}, @$children;
1265	$exp ||= 1;
1266
1267	for (0 .. $#$children) {
1268	my $child = $children->[$_];
1269
1270	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271	}
1272	}
1273
1274	CFClient::UI::harmonize \@h;
1275
1276	my $y = 0;
1277	for (0 .. $#$children) {
1278	my $child = $children->[$_];
1279	my $h = $h[$_];
1280	$child->configure (0, $y, $w, $h);
1281
1282	$y += $h;
1283	}
1284
1285	1
1286	}	1452	}
1287		1453
1288	#############################################################################	1454	#############################################################################
1289		1455
1290	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1307	ellipsise => 3, # end	1473	ellipsise => 3, # end
1308	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1309	fontsize => 1,	1475	fontsize => 1,
1310	align => -1,	1476	align => -1,
1311	valign => -1,	1477	valign => -1,
1312	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1313	can_events => 0,	1480	can_events => 0,
1314	%arg	1481	%arg
1315	);	1482	);
1316		1483
1317	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1353	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1354		1521
1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1357		1524
		1525	$self->realloc;
1358	$self->update;	1526	$self->update;
1359	$self->check_size;
1360	}	1527	}
1361		1528
1362	sub set_markup {	1529	sub set_markup {
1363	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1364		1531
…		…
1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369		1536
1370	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1372		1539
		1540	$self->realloc;
1373	$self->update;	1541	$self->update;
1374	$self->check_size;
1375	}	1542	}
1376		1543
1377	sub size_request {	1544	sub size_request {
1378	my ($self) = @_;	1545	my ($self) = @_;
1379		1546
…		…
1393		1560
1394	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1395	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1396	}	1563	}
1397		1564
1398	(	1565	($w, $h)
1399	$w + $self->{padding} * 2,
1400	$h + $self->{padding} * 2,
1401	)
1402	}	1566	}
1403		1567
1404	sub size_allocate {	1568	sub size_allocate {
1405	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1406		1570
		1571	delete $self->{ox};
		1572
1407	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408	}	1575	}
1409		1576
1410	sub set_fontsize {	1577	sub set_fontsize {
1411	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1412		1579
1413	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1414	delete $self->{texture};	1581	delete $self->{texture};
1415		1582
1416	$self->update;	1583	$self->realloc;
1417	$self->check_size;
1418	}	1584	}
1419		1585
1420	sub _draw {	1586	sub _draw {
1421	my ($self) = @_;	1587	my ($self) = @_;
1422		1588
…		…
1428	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1429	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1430	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432		1598
1433	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1434		1601
		1602	unless (exists $self->{ox}) {
1435	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1438		1606
1439	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1442
1443	$tex
1444	};	1610	};
1445		1611
1446	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448		1614
…		…
1474	active_fg => [0, 0, 0],	1640	active_fg => [0, 0, 0],
1475	can_hover => 1,	1641	can_hover => 1,
1476	can_focus => 1,	1642	can_focus => 1,
1477	valign => 0,	1643	valign => 0,
1478	can_events => 1,	1644	can_events => 1,
		1645	#text => ...
1479	@_	1646	@_
1480	)	1647	)
1481	}	1648	}
1482		1649
1483	sub _set_text {	1650	sub _set_text {
…		…
1493	$self->{text} = $text;	1660	$self->{text} = $text;
1494		1661
1495	$text =~ s/./*/g if $self->{hidden};	1662	$text =~ s/./*/g if $self->{hidden};
1496	$self->{layout}->set_text ("$text ");	1663	$self->{layout}->set_text ("$text ");
1497		1664
1498	$self->emit (changed => $self->{text});	1665	$self->_emit (changed => $self->{text});
1499	}	1666	}
1500		1667
1501	sub set_text {	1668	sub set_text {
1502	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1503		1670
1504	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1505	$self->_set_text ($text);	1672	$self->_set_text ($text);
1506	$self->update;	1673
1507	$self->check_size;	1674	$self->realloc;
1508	}	1675	}
1509		1676
1510	sub get_text {	1677	sub get_text {
1511	$_[0]{text}	1678	$_[0]{text}
1512	}	1679	}
…		…
1515	my ($self) = @_;	1682	my ($self) = @_;
1516		1683
1517	my ($w, $h) = $self->SUPER::size_request;	1684	my ($w, $h) = $self->SUPER::size_request;
1518		1685
1519	($w + 1, $h) # add 1 for cursor	1686	($w + 1, $h) # add 1 for cursor
1520	}
1521
1522	sub size_allocate {
1523	my ($self, $w, $h) = @_;
1524
1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526	}	1687	}
1527		1688
1528	sub key_down {	1689	sub key_down {
1529	my ($self, $ev) = @_;	1690	my ($self, $ev) = @_;
1530		1691
…		…
1545	} elsif ($sym == CFClient::SDLK_HOME) {	1706	} elsif ($sym == CFClient::SDLK_HOME) {
1546	$self->{cursor} = 0;	1707	$self->{cursor} = 0;
1547	} elsif ($sym == CFClient::SDLK_END) {	1708	} elsif ($sym == CFClient::SDLK_END) {
1548	$self->{cursor} = length $text;	1709	$self->{cursor} = length $text;
1549	} elsif ($uni == 27) {	1710	} elsif ($uni == 27) {
1550	$self->emit ('escape');	1711	$self->_emit ('escape');
1551	} elsif ($uni) {	1712	} elsif ($uni) {
1552	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1553	}	1714	}
1554		1715
1555	$self->_set_text ($text);	1716	$self->_set_text ($text);
1556	$self->update;	1717
1557	$self->check_size;	1718	$self->realloc;
1558	}	1719	}
1559		1720
1560	sub focus_in {	1721	sub focus_in {
1561	my ($self) = @_;	1722	my ($self) = @_;
1562		1723
…		…
1642	if ($sym == 13) {	1803	if ($sym == 13) {
1643	unshift @{$self->{history}},	1804	unshift @{$self->{history}},
1644	my $txt = $self->get_text;	1805	my $txt = $self->get_text;
1645	$self->{history_pointer} = -1;	1806	$self->{history_pointer} = -1;
1646	$self->{history_saveback} = '';	1807	$self->{history_saveback} = '';
1647	$self->emit (activate => $txt);	1808	$self->_emit (activate => $txt);
1648	$self->update;	1809	$self->update;
1649		1810
1650	} elsif ($sym == CFClient::SDLK_UP) {	1811	} elsif ($sym == CFClient::SDLK_UP) {
1651	if ($self->{history_pointer} < 0) {	1812	if ($self->{history_pointer} < 0) {
1652	$self->{history_saveback} = $self->get_text;	1813	$self->{history_saveback} = $self->get_text;
…		…
1689		1850
1690	sub new {	1851	sub new {
1691	my $class = shift;	1852	my $class = shift;
1692		1853
1693	$class->SUPER::new (	1854	$class->SUPER::new (
1694	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1695	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1696	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1697	can_hover => 1,	1859	can_hover => 1,
1698	align => 0,	1860	align => 0,
1699	valign => 0,	1861	valign => 0,
1700	can_events => 1,	1862	can_events => 1,
1701	@_	1863	@_
1702	)	1864	)
1703	}	1865	}
1704		1866
		1867	sub activate { }
		1868
1705	sub button_up {	1869	sub button_up {
1706	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1707		1871
		1872	$self->emit ("activate")
1708	if ($x >= 0 && $x < $self->{w}	1873	if $x >= 0 && $x < $self->{w}
1709	&& $y >= 0 && $y < $self->{h}) {	1874	&& $y >= 0 && $y < $self->{h};
1710	$self->emit ("activate");
1711	}
1712	}	1875	}
1713		1876
1714	sub _draw {	1877	sub _draw {
1715	my ($self) = @_;	1878	my ($self) = @_;
1716		1879
…		…
1745		1908
1746	sub new {	1909	sub new {
1747	my $class = shift;	1910	my $class = shift;
1748		1911
1749	$class->SUPER::new (	1912	$class->SUPER::new (
1750	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1751	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1752	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1753	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1754	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1755	state => 0,	1919	state => 0,
…		…
1759	}	1923	}
1760		1924
1761	sub size_request {	1925	sub size_request {
1762	my ($self) = @_;	1926	my ($self) = @_;
1763		1927
1764	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1765	}	1929	}
1766		1930
1767	sub button_down {	1931	sub button_down {
1768	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1769		1933
1770	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1773	$self->emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1774	}	1938	}
1775	}	1939	}
1776		1940
1777	sub _draw {	1941	sub _draw {
1778	my ($self) = @_;	1942	my ($self) = @_;
1779		1943
1780	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1781		1945
1782	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783		1947
1784	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785		1951
1786	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787		1953
1788	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1789		1955
…		…
2053	my $self = $class->SUPER::new (	2219	my $self = $class->SUPER::new (
2054	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2055	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2056	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2057	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2058	range => [0, 0, 100, 10],	2224	range => [0, 0, 100, 10, 0],
2059	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2060	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2061	vertical => 0,	2227	vertical => 0,
2062	can_hover => 1,	2228	can_hover => 1,
2063	inner_pad => 0.02,	2229	inner_pad => 0.02,
2064	@_	2230	@_
2065	);	2231	);
…		…
2068	$self->update;	2234	$self->update;
2069		2235
2070	$self	2236	$self
2071	}	2237	}
2072		2238
		2239	sub changed { }
		2240
		2241	sub set_range {
		2242	my ($self, $range) = @_;
		2243
		2244	($range, $self->{range}) = ($self->{range}, $range);
		2245
		2246	$self->update
		2247	if "@$range" ne "@{$self->{range}}";
		2248	}
		2249
2073	sub set_value {	2250	sub set_value {
2074	my ($self, $value) = @_;	2251	my ($self, $value) = @_;
2075		2252
2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2253	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077		2254
2078	$hi = $lo + 1 if $hi <= $lo;	2255	$hi = $lo + 1 if $hi <= $lo;
2079		2256
		2257	$page = $hi - $lo if $page > $hi - $lo;
		2258
2080	$value = $lo if $value < $lo;	2259	$value = $lo if $value < $lo;
2081	$value = $hi if $value > $hi;	2260	$value = $hi - $page if $value > $hi - $page;
2082		2261
2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2262	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084	if $unit;	2263	if $unit;
2085		2264
2086	$page = $hi - $lo if $page > $hi - $lo;
2087
2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2265	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089		2266
2090	if ($value != $old_value) {	2267	if ($value != $old_value) {
2091	$self->emit (changed => $value);	2268	$self->_emit (changed => $value);
2092	$self->update;	2269	$self->update;
2093	}	2270	}
2094	}	2271	}
2095		2272
2096	sub size_request {	2273	sub size_request {
2097	my ($self) = @_;	2274	my ($self) = @_;
2098		2275
2099	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2100	my $h = $self->{req_h};
2101
2102	$self->{vertical} ? ($h, $w) : ($w, $h)
2103	}	2277	}
2104		2278
2105	sub button_down {	2279	sub button_down {
2106	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2107		2281
2108	$self->SUPER::button_down ($ev, $x, $y);	2282	$self->SUPER::button_down ($ev, $x, $y);
		2283
		2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2285
2109	$self->mouse_motion ($ev, $x, $y);	2286	$self->mouse_motion ($ev, $x, $y);
2110	}	2287	}
2111		2288
2112	sub mouse_motion {	2289	sub mouse_motion {
2113	my ($self, $ev, $x, $y) = @_;	2290	my ($self, $ev, $x, $y) = @_;
…		…
2115	if ($GRAB == $self) {	2292	if ($GRAB == $self) {
2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2293	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117		2294
2118	my (undef, $lo, $hi, $page) = @{$self->{range}};	2295	my (undef, $lo, $hi, $page) = @{$self->{range}};
2119		2296
2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121		2298
2122	$self->set_value ($x * ($hi - $lo) + $lo);	2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123	}	2300	}
2124	}	2301	}
2125		2302
2126	sub update {	2303	sub update {
2127	my ($self) = @_;	2304	my ($self) = @_;
2128		2305
2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130	$self->set_value ($self->{range}[0]);	2307	$self->set_value ($self->{range}[0]);
2131		2308
2132	my ($value, $lo, $hi, $page) = @{$self->{range}};	2309	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2310	my $range = ($hi - $page - $lo) || 1e-100;
2133		2311
2134	my $inner_w = 1 - 2 * $self->{inner_pad};	2312	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135		2313
2136	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2314	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2315	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137		2316
2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2317	$value = ($value - $lo) / $range;
2139	$value = $self->{scale} * ($value - $lo);	2318	$value = $value * $self->{scale} + $self->{offset};
2140		2319
2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143	$value = 0 if $value < 0;
2144	$page = 1 - $value if $value + $page > 1;
2145
2146	$self->{knob_x} = $value;	2320	$self->{knob_x} = $value - $knob_w * 0.5;
2147	$self->{knob_w} = $page;	2321	$self->{knob_w} = $knob_w;
2148	});	2322	});
2149		2323
2150	$self->SUPER::update;	2324	$self->SUPER::update;
2151	}	2325	}
2152		2326
…		…
2176	# draw handle	2350	# draw handle
2177	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2351	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178		2352
2179	glDisable GL_TEXTURE_2D;	2353	glDisable GL_TEXTURE_2D;
2180	}	2354	}
		2355
		2356	#############################################################################
		2357
		2358	package CFClient::UI::ValSlider;
		2359
		2360	our @ISA = CFClient::UI::HBox::;
		2361
		2362	sub new {
		2363	my ($class, %arg) = @_;
		2364
		2365	my $range = delete $arg{range};
		2366
		2367	my $self = $class->SUPER::new (
		2368	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2369	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2370	to_value => sub { shift },
		2371	from_value => sub { shift },
		2372	%arg,
		2373	);
		2374
		2375	$self->{slider}->connect (changed => sub {
		2376	my ($self, $value) = @_;
		2377	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2378	$self->{parent}->emit (changed => $value);
		2379	});
		2380
		2381	# $self->{entry}->connect (changed => sub {
		2382	# my ($self, $value) = @_;
		2383	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2384	# $self->{parent}->emit (changed => $value);
		2385	# });
		2386
		2387	$self->add ($self->{slider}, $self->{entry});
		2388
		2389	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2390
		2391	$self
		2392	}
		2393
		2394	sub set_range { shift->{slider}->set_range (@_) }
		2395	sub set_value { shift->{slider}->set_value (@_) }
2181		2396
2182	#############################################################################	2397	#############################################################################
2183		2398
2184	package CFClient::UI::TextView;	2399	package CFClient::UI::TextView;
2185		2400
…		…
2227	$self->{layout}->set_width ($self->{children}[0]{w});	2442	$self->{layout}->set_width ($self->{children}[0]{w});
2228		2443
2229	$self->reflow;	2444	$self->reflow;
2230	}	2445	}
2231		2446
2232	sub text_height {	2447	sub text_size {
2233	my ($self, $text, $indent) = @_;	2448	my ($self, $text, $indent) = @_;
2234		2449
2235	my $layout = $self->{layout};	2450	my $layout = $self->{layout};
2236		2451
2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$layout->set_width ($self->{children}[0]{w} - $indent);	2453	$layout->set_width ($self->{children}[0]{w} - $indent);
2239	$layout->set_markup ($text);	2454	$layout->set_markup ($text);
2240		2455
2241	($layout->size)[1]	2456	$layout->size
2242	}	2457	}
2243		2458
2244	sub reflow {	2459	sub reflow {
2245	my ($self) = @_;	2460	my ($self) = @_;
2246		2461
2247	$self->{need_reflow}++;	2462	$self->{need_reflow}++;
2248	$self->update;	2463	$self->update;
2249	}	2464	}
2250		2465
		2466	sub set_offset {
		2467	my ($self, $offset) = @_;
		2468
		2469	# todo: base offset on lines or so, not on pixels
		2470	$self->{children}[1]->set_value ($offset);
		2471	}
		2472
		2473	sub clear {
		2474	my ($self) = @_;
		2475
		2476	$self->{par} = [];
		2477	$self->{height} = 0;
		2478	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2479	}
		2480
2251	sub add_paragraph {	2481	sub add_paragraph {
2252	my ($self, $color, $text, $indent) = @_;	2482	my ($self, $color, $text, $indent) = @_;
2253		2483
2254	#TODO: intelligently "reformat" paragraph
2255
2256	for my $line (split /\n/, $text) {	2484	for my $line (split /\n/, $text) {
2257	my $height = $self->text_height ($line);	2485	my ($w, $h) = $self->text_size ($line);
2258	$self->{height} += $height;	2486	$self->{height} += $h;
2259	push @{$self->{par}}, [$height, $color, $indent, $line];	2487	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260	}	2488	}
2261		2489
2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2490	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263	$self->{children}[1]->update;
2264	}	2491	}
2265		2492
2266	sub update {	2493	sub update {
2267	my ($self) = @_;	2494	my ($self) = @_;
2268		2495
…		…
2271	return unless $self->{h} > 0;	2498	return unless $self->{h} > 0;
2272		2499
2273	delete $self->{texture};	2500	delete $self->{texture};
2274		2501
2275	$ROOT->on_post_alloc ($self, sub {	2502	$ROOT->on_post_alloc ($self, sub {
		2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2504
2276	if (delete $self->{need_reflow}) {	2505	if (delete $self->{need_reflow}) {
2277	my $height = 0;	2506	my $height = 0;
2278		2507
2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2508	my $layout = $self->{layout};
		2509
		2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2511
2280	for @{$self->{par}};	2512	for (@{$self->{par}}) {
		2513	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2514	$layout->set_width ($W - $_->[3]);
		2515	$layout->set_markup ($_->[4]);
		2516	my ($w, $h) = $layout->size;
		2517	$_->[0] = $w + $_->[3];
		2518	$_->[1] = $h;
		2519	}
		2520
		2521	$height += $_->[1];
		2522	}
2281		2523
2282	$self->{height} = $height;	2524	$self->{height} = $height;
2283		2525
2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2526	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285	$self->{children}[1]->update;
2286		2527
2287	delete $self->{texture};	2528	delete $self->{texture};
2288	}	2529	}
2289		2530
2290	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2531	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291	glClearColor 0.5, 0.5, 0.5, 0;	2532	glClearColor 0.5, 0.5, 0.5, 0;
2292	glClear GL_COLOR_BUFFER_BIT;	2533	glClear GL_COLOR_BUFFER_BIT;
2293		2534
2294	my $top = int $self->{children}[1]{range}[0];	2535	my $top = int $self->{children}[1]{range}[0];
2295		2536
2296	my $y0 = $top;	2537	my $y0 = $top;
2297	my $y1 = $top + $self->{h};	2538	my $y1 = $top + $H;
2298		2539
2299	my $y = 0;	2540	my $y = 0;
2300		2541
2301	my $layout = $self->{layout};	2542	my $layout = $self->{layout};
2302		2543
2303	$layout->set_font ($self->{font}) if $self->{font};	2544	$layout->set_font ($self->{font}) if $self->{font};
2304		2545
2305	glEnable GL_BLEND;	2546	glEnable GL_BLEND;
		2547	#TODO# not correct in windows where rgba is forced off
2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2548	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307		2549
2308	for my $par (@{$self->{par}}) {	2550	for my $par (@{$self->{par}}) {
2309	my $h = $par->[0];	2551	my $h = $par->[1];
2310		2552
2311	if ($y0 < $y + $h && $y < $y1) {	2553	if ($y0 < $y + $h && $y < $y1) {
2312	$layout->set_foreground (@{ $par->[1] });	2554	$layout->set_foreground (@{ $par->[2] });
2313	$layout->set_width ($self->{w} - $par->[2]);	2555	$layout->set_width ($W - $par->[3]);
2314	$layout->set_markup ($par->[3]);	2556	$layout->set_markup ($par->[4]);
2315		2557
2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317		2559
2318	glRasterPos $par->[2], $y - $y0;	2560	glRasterPos $par->[3], $y - $y0;
2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2561	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320	}	2562	}
2321		2563
2322	$y += $h;	2564	$y += $h;
2323	}	2565	}
…		…
2390		2632
2391	sub new {	2633	sub new {
2392	my $class = shift;	2634	my $class = shift;
2393		2635
2394	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2395	state => 0,	2637	state => 0,
2396	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2397	@_	2639	@_
2398	);	2640	);
2399		2641
2400	if ($self->{state}) {
2401	$self->{state} = 0;
2402	$self->toggle_flopper;
2403	}
2404
2405	$self	2642	$self
2406	}	2643	}
2407		2644
2408	sub toggle_flopper {	2645	sub toggle_flopper {
2409	my ($self) = @_;	2646	my ($self) = @_;
2410		2647
2411	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2412	if ($self->{state} = !$self->{state}) {
2413	$CFClient::UI::ROOT->add ($self->{other});
2414	$self->{other}->move ($self->coord2global (0, $self->{h}));
2415	$self->emit ("open");
2416	} else {
2417	$CFClient::UI::ROOT->remove ($self->{other});
2418	$self->emit ("close");
2419	}
2420
2421	$self->emit (changed => $self->{state});
2422	}	2649	}
2423		2650
2424	#############################################################################	2651	#############################################################################
2425		2652
2426	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2439	}	2666	}
2440		2667
2441	sub set_tooltip_from {	2668	sub set_tooltip_from {
2442	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2443		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2444	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2445	markup => $widget->{tooltip},	2681	markup => $tooltip,
2446	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447	fontsize => 0.8,	2683	fontsize => 0.8,
2448	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2449	ellipsise => 0,	2685	ellipsise => 0,
2450	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2461		2697
2462	sub size_allocate {	2698	sub size_allocate {
2463	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2464		2700
2465	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2466	}	2720	}
2467		2721
2468	sub _draw {	2722	sub _draw {
2469	my ($self) = @_;	2723	my ($self) = @_;
2470		2724
…		…
2487	glVertex $w, $h;	2741	glVertex $w, $h;
2488	glVertex $w, 0;	2742	glVertex $w, 0;
2489	glEnd;	2743	glEnd;
2490		2744
2491	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2492	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2493	}	2748	}
2494		2749
2495	#############################################################################	2750	#############################################################################
2496		2751
…		…
2502		2757
2503	sub new {	2758	sub new {
2504	my $class = shift;	2759	my $class = shift;
2505		2760
2506	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2507	aspect => 1,	2762	aspect => 1,
		2763	can_events => 0,
2508	@_,	2764	@_,
2509	);	2765	);
2510		2766
2511	if ($self->{anim} && $self->{animspeed}) {	2767	if ($self->{anim} && $self->{animspeed}) {
2512	Scalar::Util::weaken (my $widget = $self);	2768	Scalar::Util::weaken (my $widget = $self);
…		…
2527		2783
2528	sub size_request {	2784	sub size_request {
2529	(32, 8)	2785	(32, 8)
2530	}	2786	}
2531		2787
		2788	sub update {
		2789	my ($self) = @_;
		2790
		2791	return unless $self->{visible};
		2792
		2793	$self->SUPER::update;
		2794	}
		2795
2532	sub _draw {	2796	sub _draw {
2533	my ($self) = @_;	2797	my ($self) = @_;
2534		2798
2535	return unless $::CONN;#d# manage and cache textures differently	2799	return unless $::CONN;
2536		2800
2537	my $face;	2801	my $face;
2538		2802
2539	if ($self->{frame}) {	2803	if ($self->{frame}) {
2540	my $anim = $::CONN->{anim}[$self->{anim}];	2804	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2559		2823
2560	$self->{timer}->cancel	2824	$self->{timer}->cancel
2561	if $self->{timer};	2825	if $self->{timer};
2562		2826
2563	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2564	}
2565
2566	#############################################################################
2567
2568	package CFClient::UI::InventoryItem;
2569
2570	our @ISA = CFClient::UI::HBox::;
2571
2572	sub _item_to_desc {
2573	my ($item) = @_;
2574
2575	my $desc =
2576	$item->{nrof} < 2
2577	? $item->{name}
2578	: "$item->{nrof} × $item->{name_pl}";
2579
2580	$item->{flags} & Crossfire::Protocol::F_OPEN
2581	and $desc .= " (open)";
2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
2583	and $desc .= " (applied)";
2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
2585	and $desc .= " (unpaid)";
2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
2587	and $desc .= " (magic)";
2588	$item->{flags} & Crossfire::Protocol::F_CURSED
2589	and $desc .= " (cursed)";
2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
2591	and $desc .= " (damned)";
2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
2593	and $desc .= " *";
2594
2595	$desc
2596	}
2597
2598	sub new {
2599	my $class = shift;
2600
2601	my %args = @_;
2602
2603	my $item = delete $args{item};
2604
2605	my $desc = _item_to_desc ($item);
2606
2607	my $self = $class->SUPER::new (
2608	can_hover => 1,
2609	can_events => 1,
2610	tooltip => ((CFClient::UI::Label::escape $desc)
2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612	connect_button_down => sub {
2613	my ($self, $ev, $x, $y) = @_;
2614
2615	# todo: maybe put examine on 1? but should just be a tooltip :(
2616	if ($ev->{button} == 1) {
2617	my $targ = $::CONN->{player}{tag};
2618
2619	if ($item->{container} == $::CONN->{player}{tag}) {
2620	$targ = $main::OPENCONT;
2621	}
2622
2623	$::CONN->send ("move $targ $item->{tag} 0");
2624	} elsif ($ev->{button} == 2) {
2625	$::CONN->send ("apply $item->{tag}");
2626	} elsif ($ev->{button} == 3) {
2627	my @menu_items = (
2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631	(
2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
2633	? (
2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635	)
2636	: (
2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639	)
2640	),
2641	);
2642
2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644	}
2645
2646	1
2647	},
2648	%args
2649	);
2650
2651
2652	$self->add (new CFClient::UI::Face
2653	can_events => 0,
2654	face => $item->{face},
2655	anim => $item->{anim},
2656	animspeed => $item->{animspeed},
2657	);
2658
2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661	$self->{item} = $item;
2662
2663	$self->update_item;
2664
2665	$self
2666	}
2667
2668	sub update_item {
2669	my ($self) = @_;
2670
2671	my $desc = _item_to_desc ($self->{item});
2672
2673	$self->{name_lbl}->set_text ($desc);
2674	}
2675
2676	#############################################################################
2677
2678	package CFClient::UI::Inventory;
2679
2680	our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682	sub new {
2683	my $class = shift;
2684
2685	my $self = $class->SUPER::new (
2686	scrolled => (new CFClient::UI::VBox),
2687	@_,
2688	);
2689
2690	$self
2691	}
2692
2693	sub set_items {
2694	my ($self, $items) = @_;
2695
2696	$self->{scrolled}->clear;
2697	return unless $items;
2698
2699	my @items = sort {
2700	($a->{type} <=> $b->{type})
2701	or ($a->{name} cmp $b->{name})
2702	} @$items;
2703
2704	$self->{real_items} = \@items;
2705
2706	for my $item (@items) {
2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708	$item->update_item ();
2709	}
2710
2711	$self->{scrolled}->add (@items);
2712
2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714	}
2715
2716	sub size_request {
2717	my ($self) = @_;
2718	($self->{req_w}, $self->{req_h});
2719	}	2828	}
2720		2829
2721	#############################################################################	2830	#############################################################################
2722		2831
2723	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
…		…
2758		2867
2759	# popup given the event (must be a mouse button down event currently)	2868	# popup given the event (must be a mouse button down event currently)
2760	sub popup {	2869	sub popup {
2761	my ($self, $ev) = @_;	2870	my ($self, $ev) = @_;
2762		2871
2763	$self->emit ("popdown");	2872	$self->_emit ("popdown");
2764		2873
2765	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2766	$GRAB = $self;	2875	$GRAB = $self;
2767	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2768		2877
2769	$self->show;	2878	$self->show;
2770	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771	}	2880	}
2772		2881
2773	sub mouse_motion {	2882	sub mouse_motion {
2774	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2775		2884
…		…
2783		2892
2784	if ($ev->{button} == $self->{button}) {	2893	if ($ev->{button} == $self->{button}) {
2785	undef $GRAB;	2894	undef $GRAB;
2786	$self->hide;	2895	$self->hide;
2787		2896
2788	$self->emit ("popdown");	2897	$self->_emit ("popdown");
2789	$self->{hover}[1]->() if $self->{hover};	2898	$self->{hover}[1]->() if $self->{hover};
2790	}	2899	}
2791	}	2900	}
2792		2901
2793	#############################################################################	2902	#############################################################################
…		…
2855	sub add {	2964	sub add {
2856	my ($self, $text, %arg) = @_;	2965	my ($self, $text, %arg) = @_;
2857		2966
2858	$text =~ s/^\s+//;	2967	$text =~ s/^\s+//;
2859	$text =~ s/\s+$//;	2968	$text =~ s/\s+$//;
		2969
		2970	return unless $text;
2860		2971
2861	my $timeout = time + ((delete $arg{timeout}) || 60);	2972	my $timeout = time + ((delete $arg{timeout}) || 60);
2862		2973
2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864		2975
…		…
2898	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2899	}	3010	}
2900		3011
2901	#############################################################################	3012	#############################################################################
2902		3013
2903	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2904		3015
2905	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907	use CFClient::OpenGL;
2908		3017
2909	sub new {	3018	sub new {
2910	my $class = shift;	3019	my $class = shift;
2911		3020
2912	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2913	@_,	3023	@_,
2914	)	3024	);
2915	}
2916		3025
2917	sub configure {	3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156	# if $commit is true, the binding will be set after the user entered a key combo
		3157	sub ask_for_bind {
		3158	my ($self, $commit) = @_;
		3159
		3160	CFClient::Binder::open_binding_dialog (sub {
		3161	my ($mod, $sym) = @_;
		3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3163	$self->update_binding_widgets;
		3164	$self->commit if $commit;
		3165	});
		3166	}
		3167
		3168	# $mod and $sym are the modifiers and key symbol
		3169	# $cmds is a array ref of strings (the commands)
		3170	# $cb is the callback that is executed on OK
		3171	# $ccb is the callback that is executed on CANCEL and
		3172	# when the binding was unsuccessful on OK
		3173	sub set_binding {
2918	my ($self, $x, $y, $w, $h) = @_;	3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2919		3175
2920	$self->{w} = $w;	3176	$self->clear_command_list;
2921	$self->{h} = $h;	3177	$self->{recording} = 0;
2922	}	3178	$self->{rec_btn}->set_text ("start recording");
2923		3179
2924	sub check_size {	3180	$self->{binding} = [$mod, $sym];
		3181	$self->{commands} = $cmds;
		3182
		3183	$self->{binding_change} = $cb;
		3184	$self->{binding_cancel} = $ccb;
		3185
		3186	$self->update_binding_widgets;
		3187	}
		3188
		3189	# this is a shortcut method that asks for a binding
		3190	# and then just binds it.
		3191	sub do_quick_binding {
2925	my ($self) = @_;	3192	my ($self, $cmds) = @_;
		3193	$self->set_binding (undef, undef, $cmds, sub {
		3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3195	});
		3196	$self->ask_for_bind (1);
		3197	}
2926		3198
2927	$self->size_allocate ($self->{w}, $self->{h})	3199	sub update_binding_widgets {
2928	if $self->{w};	3200	my ($self) = @_;
		3201	my ($mod, $sym, $cmds) = $self->get_binding;
		3202	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3203	$self->set_command_list ($cmds);
		3204	}
		3205
		3206	sub get_binding {
		3207	my ($self) = @_;
		3208	return (
		3209	$self->{binding}->[0],
		3210	$self->{binding}->[1],
		3211	[ grep { defined $_ } @{$self->{commands}} ]
		3212	);
		3213	}
		3214
		3215	sub clear_command_list {
		3216	my ($self) = @_;
		3217	$self->{cmdbox}->clear ();
		3218	}
		3219
		3220	sub set_command_list {
		3221	my ($self, $cmds) = @_;
		3222
		3223	$self->{cmdbox}->clear ();
		3224	$self->{commands} = $cmds;
		3225
		3226	my $idx = 0;
		3227
		3228	for (@$cmds) {
		3229	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3230
		3231	my $i = $idx;
		3232	$hb->add (new CFClient::UI::Label text => $_);
		3233	$hb->add (new CFClient::UI::Button
		3234	text => "delete",
		3235	tooltip => "Deletes the action from the record",
		3236	on_activate => sub {
		3237	$self->{cmdbox}->remove ($hb);
		3238	$cmds->[$i] = undef;
		3239	});
		3240
		3241
		3242	$idx++
		3243	}
		3244	}
		3245
		3246	#############################################################################
		3247
		3248	package CFClient::UI::SpellList;
		3249
		3250	our @ISA = CFClient::UI::FancyFrame::;
		3251
		3252	sub new {
		3253	my $class = shift;
		3254
		3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3256
		3257	$self->add (new CFClient::UI::ScrolledWindow
		3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3259
		3260	$self;
		3261	}
		3262
		3263	# XXX: Do sorting? Argl...
		3264	sub add_spell {
		3265	my ($self, $spell) = @_;
		3266	$self->{spells}->{$spell->{name}} = $spell;
		3267
		3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3269	face => $spell->{face},
		3270	can_hover => 1,
		3271	can_events => 1,
		3272	tooltip => $spell->{message});
		3273
		3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3275	text => $spell->{name},
		3276	can_hover => 1,
		3277	can_events => 1,
		3278	tooltip => $spell->{message},
		3279	expand => 1);
		3280
		3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3283	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3287	text => "bind to key",
		3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3289	}
		3290
		3291	sub rebuild_spell_list {
		3292	my ($self) = @_;
		3293	$self->{tbl_idx} = 0;
		3294	$self->add_spell ($_) for values %{$self->{spells}};
		3295	}
		3296
		3297	sub remove_spell {
		3298	my ($self, $spell) = @_;
		3299	delete $self->{spells}->{$spell->{name}};
		3300	$self->rebuild_spell_list;
		3301	}
		3302
		3303	#############################################################################
		3304
		3305	package CFClient::UI::Root;
		3306
		3307	our @ISA = CFClient::UI::Container::;
		3308
		3309	use CFClient::OpenGL;
		3310
		3311	sub new {
		3312	my $class = shift;
		3313
		3314	my $self = $class->SUPER::new (
		3315	visible => 1,
		3316	@_,
		3317	);
		3318
		3319	Scalar::Util::weaken ($self->{root} = $self);
		3320
		3321	$self
2929	}	3322	}
2930		3323
2931	sub size_request {	3324	sub size_request {
2932	my ($self) = @_;	3325	my ($self) = @_;
2933		3326
2934	($self->{w}, $self->{h})	3327	($self->{w}, $self->{h})
		3328	}
		3329
		3330	sub _to_pixel {
		3331	my ($coord, $size, $max) = @_;
		3332
		3333	$coord =
		3334	$coord eq "center" ? ($max - $size) * 0.5
		3335	: $coord eq "max" ? $max
		3336	: $coord;
		3337
		3338	$coord = 0 if $coord < 0;
		3339	$coord = $max - $size if $coord > $max - $size;
		3340
		3341	int $coord + 0.5
2935	}	3342	}
2936		3343
2937	sub size_allocate {	3344	sub size_allocate {
2938	my ($self, $w, $h) = @_;	3345	my ($self, $w, $h) = @_;
2939		3346
2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946	for my $child ($self->children) {	3347	for my $child ($self->children) {
2947	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3348	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948		3349
2949	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3350	$X = $child->{force_x} if exists $child->{force_x};
2950	if exists $child->{req_x};	3351	$Y = $child->{force_y} if exists $child->{force_y};
2951		3352
2952	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3353	$X = _to_pixel $X, $W, $self->{w};
2953	if exists $child->{req_y};	3354	$Y = _to_pixel $Y, $H, $self->{h};
2954
2955	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957		3355
2958	$child->configure ($X, $Y, $W, $H);	3356	$child->configure ($X, $Y, $W, $H);
2959	}	3357	}
2960	}	3358	}
2961		3359
…		…
2972	}	3370	}
2973		3371
2974	sub update {	3372	sub update {
2975	my ($self) = @_;	3373	my ($self) = @_;
2976		3374
2977	$self->check_size;
2978	$::WANT_REFRESH++;	3375	$::WANT_REFRESH++;
2979	}	3376	}
2980		3377
2981	sub add {	3378	sub add {
2982	my ($self, @children) = @_;	3379	my ($self, @children) = @_;
2983		3380
2984	for my $child (@children) {
2985	$child->{toplevel} = 1;	3381	$_->{is_toplevel} = 1
2986		3382	for @children;
2987	# integerise window positions
2988	$child->{x} = int $child->{x};
2989	$child->{y} = int $child->{y};
2990	}
2991		3383
2992	$self->SUPER::add (@children);	3384	$self->SUPER::add (@children);
		3385	}
		3386
		3387	sub remove {
		3388	my ($self, @children) = @_;
		3389
		3390	$self->SUPER::remove (@children);
		3391
		3392	delete $self->{is_toplevel}
		3393	for @children;
		3394
		3395	while (@children) {
		3396	my $w = pop @children;
		3397	push @children, $w->children;
		3398	$w->set_invisible;
		3399	}
2993	}	3400	}
2994		3401
2995	sub on_refresh {	3402	sub on_refresh {
2996	my ($self, $id, $cb) = @_;	3403	my ($self, $id, $cb) = @_;
2997		3404
…		…
3010	while ($self->{refresh_hook}) {	3417	while ($self->{refresh_hook}) {
3011	$_->()	3418	$_->()
3012	for values %{delete $self->{refresh_hook}};	3419	for values %{delete $self->{refresh_hook}};
3013	}	3420	}
3014		3421
3015	if ($self->{check_size}) {	3422	if ($self->{realloc}) {
3016	my @queue = ([], []);	3423	my %queue;
		3424	my @queue;
		3425	my $widget;
3017		3426
3018	for (;;) {	3427	outer:
3019	if ($self->{check_size}) {	3428	while () {
3020	# heuristic: check containers last	3429	if (my $realloc = delete $self->{realloc}) {
3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3430	for $widget (values %$realloc) {
3022	for values %{delete $self->{check_size}}	3431	$widget->{visible} or next; # do not resize invisible widgets
		3432
		3433	$queue{$widget+0}++ and next; # duplicates are common
		3434
		3435	push @{ $queue[$widget->{visible}] }, $widget;
		3436	}
3023	}	3437	}
3024		3438
3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3439	while () {
		3440	@queue or last outer;
3026		3441
3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3442	$widget = pop @{ $queue[-1] || [] }
3028	? @$widget{qw(user_w user_h)}	3443	and last;
3029	: $widget->size_request;
3030
3031	if (delete $widget->{force_alloc}
3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034		3444
		3445	pop @queue;
		3446	}
		3447
		3448	delete $queue{$widget+0};
		3449
		3450	my ($w, $h) = $widget->size_request;
		3451
		3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3453	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3454
		3455	$w = $widget->{force_w} if exists $widget->{force_w};
		3456	$h = $widget->{force_h} if exists $widget->{force_h};
		3457
		3458	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3459	|| delete $widget->{force_realloc}) {
3035	$widget->{req_w} = $w;	3460	$widget->{req_w} = $w;
3036	$widget->{req_h} = $h;	3461	$widget->{req_h} = $h;
3037		3462
3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3463	$self->{size_alloc}{$widget+0} = $widget;
3039		3464
3040	$widget->{parent}->check_size
3041	if $widget->{parent};	3465	if (my $parent = $widget->{parent}) {
		3466	$self->{realloc}{$parent+0} = $parent
		3467	unless $queue{$parent+0};
		3468
		3469	$parent->{force_size_alloc} = 1;
		3470	$self->{size_alloc}{$parent+0} = $parent;
		3471	}
3042	}	3472	}
		3473
		3474	delete $self->{realloc}{$widget+0};
3043	}	3475	}
3044	}	3476	}
3045		3477
3046	while ($self->{size_alloc}) {	3478	while (my $size_alloc = delete $self->{size_alloc}) {
3047	for (values %{delete $self->{size_alloc}}) {	3479	my @queue = sort { $b->{visible} <=> $a->{visible} }
3048	my ($widget, $w, $h) = @$_;	3480	values %$size_alloc;
		3481
		3482	while () {
		3483	my $widget = pop @queue || last;
		3484
		3485	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049		3486
3050	$w = 0 if $w < 0;	3487	$w = 0 if $w < 0;
3051	$h = 0 if $h < 0;	3488	$h = 0 if $h < 0;
3052		3489
		3490	$w = int $w + 0.5;
		3491	$h = int $h + 0.5;
		3492
		3493	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3494	$widget->{old_w} = $widget->{w};
		3495	$widget->{old_h} = $widget->{h};
		3496
3053	$widget->{w} = $w;	3497	$widget->{w} = $w;
3054	$widget->{h} = $h;	3498	$widget->{h} = $h;
3055	$widget->size_allocate ($w, $h);	3499
3056	$widget->emit (size_allocate => $w, $h);	3500	$widget->emit (size_allocate => $w, $h);
		3501	}
3057	}	3502	}
3058	}	3503	}
3059		3504
3060	while ($self->{post_alloc_hook}) {	3505	while ($self->{post_alloc_hook}) {
3061	$_->()	3506	$_->()
3062	for values %{delete $self->{post_alloc_hook}};	3507	for values %{delete $self->{post_alloc_hook}};
3063	}	3508	}
		3509
3064		3510
3065	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067	glClear GL_COLOR_BUFFER_BIT;	3513	glClear GL_COLOR_BUFFER_BIT;
3068		3514
…		…
3070	glLoadIdentity;	3516	glLoadIdentity;
3071	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072	glMatrixMode GL_MODELVIEW;	3518	glMatrixMode GL_MODELVIEW;
3073	glLoadIdentity;	3519	glLoadIdentity;
3074		3520
		3521	{
		3522	package CFClient::UI::Base;
		3523
		3524	($draw_x, $draw_y, $draw_w, $draw_h) =
		3525	(0, 0, $self->{w}, $self->{h});
		3526	}
		3527
3075	$self->_draw;	3528	$self->_draw;
3076	}	3529	}
3077		3530
3078	#############################################################################	3531	#############################################################################
3079		3532

Diff Legend

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