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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
8	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
9		11
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		13
		14	our $LAYOUT;
12	our $ROOT;	15	our $ROOT;
13	our $TOOLTIP;	16	our $TOOLTIP;
14	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		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
		33	$layout
		34	}
		35
		36	sub set_layout {
		37	my ($layout) = @_;
		38	$LAYOUT = $layout;
		39	}
15		40
16	sub check_tooltip {	41	sub check_tooltip {
17	if (!$GRAB) {	42	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	44	if (length $widget->{tooltip}) {
20		45
21	if ($TOOLTIP->{owner} != $widget) {	46	if ($TOOLTIP->{owner} != $widget) {
		47	$TOOLTIP->hide;
		48
22	$TOOLTIP->{owner} = $widget;	49	$TOOLTIP->{owner} = $widget;
23		50
24	my $tip = $widget->{tooltip};	51	my $tip = $widget->{tooltip};
25		52
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	53	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		54
28	$TOOLTIP->set_markup ($widget->{tooltip});	55	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	56	$TOOLTIP->show;
31	}	57	}
32		58
33	return;	59	return;
34	}	60	}
…		…
39	delete $TOOLTIP->{owner};	65	delete $TOOLTIP->{owner};
40	}	66	}
41		67
42	# class methods for events	68	# class methods for events
43	sub feed_sdl_key_down_event {	69	sub feed_sdl_key_down_event {
44	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	70	$FOCUS->emit (key_down => $_[0])
45	if $FOCUS;	71	if $FOCUS;
46	}	72	}
47		73
48	sub feed_sdl_key_up_event {	74	sub feed_sdl_key_up_event {
49	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	75	$FOCUS->emit (key_up => $_[0])
50	if $FOCUS;	76	if $FOCUS;
51	}	77	}
52		78
53	sub feed_sdl_button_down_event {	79	sub feed_sdl_button_down_event {
54	my ($ev) = @_;	80	my ($ev) = @_;
…		…
63	check_tooltip;	89	check_tooltip;
64	}	90	}
65		91
66	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	92	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
67		93
68	if ($GRAB) {	94	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69	($x, $y) = $GRAB->coord2local ($x, $y);	95	if $GRAB;
70	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71	}
72	}	96	}
73		97
74	sub feed_sdl_button_up_event {	98	sub feed_sdl_button_up_event {
75	my ($ev) = @_;	99	my ($ev) = @_;
76	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
77		101
78	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	102	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79		103
80	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	104	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81		105
82	if ($GRAB) {	106	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83	($x, $y) = $GRAB->coord2local ($x, $y);	107	if $GRAB;
84	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85	}
86		108
87	if (!$BUTTON_STATE) {	109	if (!$BUTTON_STATE) {
88	my $grab = $GRAB; undef $GRAB;	110	my $grab = $GRAB; undef $GRAB;
89	$grab->update if $grab;	111	$grab->update if $grab;
90	$GRAB->update if $GRAB;	112	$GRAB->update if $GRAB;
…		…
106	$HOVER->update if $HOVER && $HOVER->{can_hover};	128	$HOVER->update if $HOVER && $HOVER->{can_hover};
107		129
108	check_tooltip;	130	check_tooltip;
109	}	131	}
110		132
111	if ($HOVER) {
112	($x, $y) = $HOVER->coord2local ($x, $y);
113	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	133	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114	}	134	if $HOVER;
115	}	135	}
116		136
117	# convert position array to integers	137	# convert position array to integers
118	sub harmonize {	138	sub harmonize {
119	my ($vals) = @_;	139	my ($vals) = @_;
…		…
125	$rem += $_ - $i;	145	$rem += $_ - $i;
126	$_ = $i;	146	$_ = $i;
127	}	147	}
128	}	148	}
129		149
		150	sub full_refresh {
		151	# make a copy, otherwise for complains about freed values.
		152	my @widgets = values %WIDGET;
		153
		154	$_->update
		155	for @widgets;
		156	}
		157
		158	sub reconfigure_widgets {
		159	# make a copy, otherwise C<for> complains about freed values.
		160	my @widgets = values %WIDGET;
		161
		162	$_->reconfigure
		163	for @widgets;
		164	}
		165
		166	# call when resolution changes etc.
		167	sub rescale_widgets {
		168	my ($sx, $sy) = @_;
		169
		170	for my $widget (values %WIDGET) {
		171	if ($widget->{is_toplevel}) {
		172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		174
		175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
		178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
		179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		181
		182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		184
		185	}
		186	}
		187
		188	reconfigure_widgets;
		189	}
		190
130	#############################################################################	191	#############################################################################
131		192
132	package CFClient::UI::Base;	193	package CFClient::UI::Base;
133		194
134	use strict;	195	use strict;
…		…
137		198
138	sub new {	199	sub new {
139	my $class = shift;	200	my $class = shift;
140		201
141	my $self = bless {	202	my $self = bless {
142	x => 0,	203	x => "center",
143	y => 0,	204	y => "center",
144	z => 0,	205	z => 0,
		206	w => undef,
		207	h => undef,
145	can_events => 1,	208	can_events => 1,
146	@_	209	@_
147	}, $class;	210	}, $class;
148		211
		212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		217
		218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		220	}
		221
		222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		223
149	for (keys %$self) {	224	for (keys %$self) {
150	if (/^connect_(.*)$/) {	225	if (/^on_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	226	$self->connect ($1 => delete $self->{$_});
152	}	227	}
153	}	228	}
154		229
155	$self	230	$self
…		…
168	return if $self->{parent};	243	return if $self->{parent};
169		244
170	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
171	}	246	}
172		247
173	sub hide {	248	sub set_visible {
174	my ($self) = @_;	249	my ($self) = @_;
		250
		251	return if $self->{visible};
		252
		253	$self->{root} = $self->{parent}{root};
		254	$self->{visible} = $self->{parent}{visible} + 1;
		255
		256	$self->emit (visibility_change => 1);
		257
		258	$self->realloc if !exists $self->{req_w};
		259
		260	$_->set_visible for $self->children;
		261	}
		262
		263	sub set_invisible {
		264	my ($self) = @_;
		265
		266	return unless $self->{visible};
		267
		268	$_->set_invisible for $self->children;
		269
		270	delete $self->{root};
		271	delete $self->{visible};
175		272
176	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
177	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
178		275
		276	CFClient::UI::check_tooltip
		277	if $TOOLTIP->{owner} == $self;
		278
		279	$self->focus_out;
		280
		281	$self->emit (visibility_change => 0);
		282	}
		283
		284	sub set_visibility {
		285	my ($self, $visible) = @_;
		286
		287	return if $self->{visible} == $visible;
		288
		289	$visible ? $self->hide
		290	: $self->show;
		291	}
		292
		293	sub toggle_visibility {
		294	my ($self) = @_;
		295
		296	$self->{visible}
		297	? $self->hide
		298	: $self->show;
		299	}
		300
		301	sub hide {
		302	my ($self) = @_;
		303
		304	$self->set_invisible;
		305
179	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
180	if $self->{parent};	307	if $self->{parent};
181	}	308	}
182		309
183	sub move {	310	sub move_abs {
184	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
185		312
186	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
187	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
188	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
189		316
190	$self->update;	317	$self->update;
191	}	318	}
192		319
193	sub set_size {	320	sub set_size {
194	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
195		322
196	$self->{user_w} = $w;	323	$self->{force_w} = $w;
197	$self->{user_h} = $h;	324	$self->{force_h} = $h;
198		325
199	$self->check_size;	326	$self->realloc;
200	}	327	}
201		328
202	sub size_request {	329	sub size_request {
203	require Carp;	330	require Carp;
204	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
206		333
207	sub configure {	334	sub configure {
208	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
209		336
210	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
211	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
212	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
213		342
214	# use alignment to adjust x, y	343	# use alignment to adjust x, y
215		344
216	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
217	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
218
219	($w, $h) = ($w2, $h2);
220	}	347	}
221		348
222	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
223	$self->{x} = $x;	350	$self->{x} = $x;
224	$self->{y} = $y;	351	$self->{y} = $y;
225	$self->update;	352	$self->update;
226	}	353	}
227		354
228	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	356	return unless $self->{visible};
230	$self->{h} = $h;
231		357
232	$self->size_allocate ($w, $h);	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
233	$self->update;
234	}	359	}
235	}	360	}
236		361
237	sub size_allocate {	362	sub size_allocate {
238	# nothing to be done	363	# nothing to be done
239	}	364	}
240		365
		366	sub children {
		367	}
		368
241	sub set_max_size {	369	sub set_max_size {
242	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
243		371
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	372	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	374	}
247		375
248	# return top left coordinates	376	sub set_tooltip {
249	sub _topleft {
250	my ($self, $x, $y) = @_;	377	my ($self, $tooltip) = @_;
251		378
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
		383
		384	$self->{tooltip} = $tooltip;
		385
		386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		387	delete $CFClient::UI::TOOLTIP->{owner};
		388	CFClient::UI::check_tooltip;
		389	}
253	}	390	}
254		391
255	# translate global coordinates to local coordinate system	392	# translate global coordinates to local coordinate system
256	sub coord2local {	393	sub coord2local {
257	my ($self, $x, $y) = @_;	394	my ($self, $x, $y) = @_;
258		395
259	my ($X, $Y) = $self->_topleft;	396	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260	($x - $X, $y - $Y)
261	}	397	}
262		398
263	# translate local coordinates to global coordinate system	399	# translate local coordinates to global coordinate system
264	sub coord2global {	400	sub coord2global {
265	my ($self, $x, $y) = @_;	401	my ($self, $x, $y) = @_;
266		402
267	my ($X, $Y) = $self->_topleft;	403	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268	($x + $X, $y + $Y)
269	}	404	}
270		405
271	sub focus_in {	406	sub focus_in {
272	my ($self) = @_;	407	my ($self) = @_;
273		408
274	return if $FOCUS == $self;	409	return if $FOCUS == $self;
275	return unless $self->{can_focus};	410	return unless $self->{can_focus};
276		411
277	my $focus = $FOCUS; $FOCUS = $self;	412	my $focus = $FOCUS; $FOCUS = $self;
278		413
279	$self->emit (focus_in => $focus);	414	$self->_emit (focus_in => $focus);
280		415
281	$focus->update if $focus;	416	$focus->update if $focus;
282	$FOCUS->update;	417	$FOCUS->update;
283	}	418	}
284		419
…		…
287		422
288	return unless $FOCUS == $self;	423	return unless $FOCUS == $self;
289		424
290	my $focus = $FOCUS; undef $FOCUS;	425	my $focus = $FOCUS; undef $FOCUS;
291		426
292	$self->emit (focus_out => $focus);	427	$self->_emit (focus_out => $focus);
293		428
294	$focus->update if $focus; #?	429	$focus->update if $focus; #?
		430
		431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		432	unless $FOCUS;
295	}	433	}
296		434
297	sub mouse_motion { }	435	sub mouse_motion { }
298	sub button_up { }	436	sub button_up { }
299	sub key_down { }	437	sub key_down { }
300	sub key_up { }	438	sub key_up { }
301		439
302	sub button_down {	440	sub button_down {
303	my ($self, $ev, $x, $y) = @_;	441	my ($self, $ev, $x, $y) = @_;
304		442
305	$self->focus_in;	443	$self->focus_in;
…		…
308	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
309	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
310	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
311	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
312	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		451
		452	sub find_widget {
		453	my ($self, $x, $y) = @_;
		454
		455	return () unless $self->{can_events};
		456
		457	return $self
		458	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		459	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		460
		461	()
		462	}
		463
		464	sub set_parent {
		465	my ($self, $parent) = @_;
		466
		467	Scalar::Util::weaken ($self->{parent} = $parent);
		468
		469	$self->set_visible if $parent->{visible};
		470	}
		471
		472	sub connect {
		473	my ($self, $signal, $cb) = @_;
		474
		475	push @{ $self->{signal_cb}{$signal} }, $cb;
		476	}
		477
		478	sub _emit {
		479	my ($self, $signal, @args) = @_;
		480
		481	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		482	}
		483
		484	sub emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	$self->_emit ($signal, @args)
		488	|| $self->$signal (@args);
		489	}
		490
		491	sub visibility_change {
		492	#my ($self, $visible) = @_;
		493	}
		494
		495	sub realloc {
		496	my ($self) = @_;
		497
		498	if ($self->{visible}) {
		499	return if $self->{root}{realloc}{$self};
		500
		501	$self->{root}{realloc}{$self} = $self;
		502	$self->{root}->update;
		503	} else {
		504	delete $self->{req_w};
		505	}
		506	}
		507
		508	sub update {
		509	my ($self) = @_;
		510
		511	$self->{parent}->update
		512	if $self->{parent};
		513	}
		514
		515	sub reconfigure {
		516	my ($self) = @_;
		517
		518	$self->realloc;
		519	$self->update;
		520	}
313		521
314	sub draw {	522	sub draw {
315	my ($self) = @_;	523	my ($self) = @_;
316		524
317	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
334	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
335	glEnd;	543	glEnd;
336	glDisable GL_BLEND;	544	glDisable GL_BLEND;
337	}	545	}
338		546
339	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
340	glPushMatrix;	548	glPushMatrix;
341	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
342	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
344	glVertex 0 , 0;	552	glVertex 0 , 0;
345	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
346	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
347	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
348	glEnd;	556	glEnd;
349	glPopMatrix;	557	glPopMatrix;
350	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351	}	559	}
352	}	560	}
353		561
354	sub _draw {	562	sub _draw {
355	my ($self) = @_;	563	my ($self) = @_;
356		564
357	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
358	}	566	}
359		567
360	sub find_widget {
361	my ($self, $x, $y) = @_;
362
363	return () unless $self->{can_events};
364
365	return $self
366	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369	()
370	}
371
372	sub set_parent {
373	my ($self, $parent) = @_;
374
375	Scalar::Util::weaken ($self->{parent} = $parent);
376	}
377
378	sub check_size {
379	my ($self) = @_;
380
381	$self->{parent}
382	or return 1;
383
384	my ($w, $h) = $self->{user_w} && $self->{user_h}
385	? @$self{qw(user_w user_h)}
386	: $self->size_request;
387
388	if ($w != $self->{req_w} || $h != $self->{req_h}) {
389	$self->{req_w} = $w;
390	$self->{req_h} = $h;
391
392	$self->{parent}->check_size
393	or $self->size_allocate (
394	(List::Util::max $self->{w}, $w),
395	(List::Util::max $self->{h}, $h),
396	);
397
398	1
399	} else {
400	0
401	}
402	}
403
404	sub update {
405	my ($self) = @_;
406
407	$self->{parent}->update
408	if $self->{parent};
409	}
410
411	sub connect {
412	my ($self, $signal, $cb) = @_;
413
414	push @{ $self->{signal_cb}{$signal} }, $cb;
415	}
416
417	sub emit {
418	my ($self, $signal, @args) = @_;
419
420	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421	}
422
423	sub DESTROY {	568	sub DESTROY {
424	my ($self) = @_;	569	my ($self) = @_;
425		570
		571	delete $WIDGET{$self+0};
426	#$self->deactivate;	572	#$self->deactivate;
427	}	573	}
428		574
429	#############################################################################	575	#############################################################################
430		576
…		…
439	my $class = shift;	585	my $class = shift;
440		586
441	# range [value, low, high, page]	587	# range [value, low, high, page]
442		588
443	$class->SUPER::new (	589	$class->SUPER::new (
444	bg => [0, 0, 0, 0.2],	590	#bg => [0, 0, 0, 0.2],
445	active_bg => [1, 1, 1, 0.5],	591	#active_bg => [1, 1, 1, 0.5],
446	@_	592	@_
447	)	593	)
448	}	594	}
449		595
450	sub _draw {	596	sub _draw {
451	my ($self) = @_;	597	my ($self) = @_;
452		598
		599	my $color = $FOCUS == $self && $self->{active_bg}
		600	? $self->{active_bg}
		601	: $self->{bg};
		602
		603	if ($color && (@$color < 4 || $color->[3])) {
453	my ($w, $h) = @$self{qw(w h)};	604	my ($w, $h) = @$self{qw(w h)};
454		605
455	glEnable GL_BLEND;	606	glEnable GL_BLEND;
456	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	608	glColor @$color;
458		609
459	glBegin GL_QUADS;	610	glBegin GL_QUADS;
460	glVertex 0 , 0;	611	glVertex 0 , 0;
461	glVertex 0 , $h;	612	glVertex 0 , $h;
462	glVertex $w, $h;	613	glVertex $w, $h;
463	glVertex $w, 0;	614	glVertex $w, 0;
464	glEnd;	615	glEnd;
465		616
466	glDisable GL_BLEND;	617	glDisable GL_BLEND;
		618	}
467	}	619	}
468		620
469	#############################################################################	621	#############################################################################
470		622
471	package CFClient::UI::Empty;	623	package CFClient::UI::Empty;
…		…
476	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
477	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
478	}	630	}
479		631
480	sub size_request {	632	sub size_request {
481	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
482	}	636	}
483		637
484	sub draw { }	638	sub draw { }
485		639
486	#############################################################################	640	#############################################################################
…		…
503		657
504	$self	658	$self
505	}	659	}
506		660
507	sub add {	661	sub add {
508	my ($self, $child) = @_;	662	my ($self, @widgets) = @_;
509		663
510	$child->set_parent ($self);	664	$_->set_parent ($self)
		665	for @widgets;
511		666
512	use sort 'stable';	667	use sort 'stable';
513		668
514	$self->{children} = [	669	$self->{children} = [
515	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
516	@{$self->{children}}, $child	671	@{$self->{children}}, @widgets
517	];	672	];
518		673
519	$child->check_size;	674	$self->realloc;
		675	}
		676
		677	sub children {
		678	@{ $_[0]{children} }
520	}	679	}
521		680
522	sub remove {	681	sub remove {
523	my ($self, $child) = @_;	682	my ($self, $child) = @_;
524		683
525	delete $child->{parent};	684	delete $child->{parent};
526	$child->hide;	685	$child->hide;
527		686
528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529		688
530	$self->check_size;	689	$self->realloc;
531	$self->update;
532	}	690	}
533		691
534	sub clear {	692	sub clear {
535	my ($self) = @_;	693	my ($self) = @_;
536		694
…		…
539		697
540	for (@$children) {	698	for (@$children) {
541	delete $_->{parent};	699	delete $_->{parent};
542	$_->hide;	700	$_->hide;
543	}	701	}
		702
		703	$self->realloc;
544	}	704	}
545		705
546	sub find_widget {	706	sub find_widget {
547	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
548		708
…		…
601	sub size_request {	761	sub size_request {
602	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
603	}	763	}
604		764
605	sub size_allocate {	765	sub size_allocate {
606	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
607		767
608	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
609	}	769	}
610		770
611	#############################################################################	771	#############################################################################
…		…
623	}	783	}
624		784
625	sub update {	785	sub update {
626	my ($self) = @_;	786	my ($self) = @_;
627		787
628	# we want to do this delayed...	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
629	$self->render_chld;
630	$self->SUPER::update;	789	$self->SUPER::update;
631	}	790	}
632		791
		792	sub size_allocate {
		793	my ($self, $w, $h, $changed) = @_;
		794
		795	$self->SUPER::size_allocate ($w, $h, $changed);
		796	$self->update
		797	if $changed;
		798	}
		799
		800	sub _render {
		801	$_[0]{children}[0]->draw;
		802	}
		803
633	sub render_chld {	804	sub render_child {
634	my ($self) = @_;	805	my ($self) = @_;
635		806
636	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637	glClearColor 0, 0, 0, 1;	808	glClearColor 0, 0, 0, 0;
638	glClear GL_COLOR_BUFFER_BIT;	809	glClear GL_COLOR_BUFFER_BIT;
639	$self->child->draw;	810
		811	$self->_render;
640	};	812	};
641	}
642
643	sub size_allocate {
644	my ($self, $w, $h) = @_;
645
646	$self->child->configure (0, 0, $w, $h);
647
648	$self->render_chld;
649	}	813	}
650		814
651	sub _draw {	815	sub _draw {
652	my ($self) = @_;	816	my ($self) = @_;
653		817
654	my ($w, $h) = ($self->w, $self->h);	818	my ($w, $h) = ($self->w, $self->h);
655		819
656	my $tex = $self->{texture}	820	my $tex = $self->{texture}
657	or return;	821	or return;
658		822
659	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	823	glEnable GL_TEXTURE_2D;
662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	824	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		825	glColor 1, 1, 1, 1;
663		826
664	$tex->draw_quad (0, 0, $w, $h);	827	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665		828
666	glDisable GL_BLEND;
667	glDisable GL_TEXTURE_2D;	829	glDisable GL_TEXTURE_2D;
668	}	830	}
669		831
670	#############################################################################	832	#############################################################################
671		833
672	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
673		835
674	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
675
676	sub new { die }
677
678	sub size_request {
679	my ($self) = @_;
680
681	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684	@$self{qw(child_w child_h)}
685	}
686
687	sub _draw {
688	my ($self) = @_;
689
690	$self->{children}[1]->draw;
691	}
692
693
694	#############################################################################
695
696	package CFClient::UI::Frame;
697
698	our @ISA = CFClient::UI::Bin::;
699
700	use CFClient::OpenGL;
701		837
702	sub new {	838	sub new {
703	my $class = shift;	839	my $class = shift;
704		840
705	my $self = $class->SUPER::new (	841	$class->SUPER::new (
706	bg => [1, 1, 1, 1],	842	scroll_x => 0,
707	border_bg => [1, 1, 1, 1],	843	scroll_y => 1,
708	border => 0.8,
709	@_	844	@_,
710	);	845	)
711
712	$self
713	}	846	}
714		847
715	sub _draw {	848	sub size_request {
		849	my ($self) = @_;
		850
		851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		852
		853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
		857	}
		858
		859	sub size_allocate {
		860	my ($self, $w, $h, $changed) = @_;
		861
		862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		864
		865	$self->child->configure (0, 0, $w, $h);
		866	$self->update;
		867	}
		868
		869	sub set_offset {
716	my ($self) = @_;	870	my ($self, $x, $y) = @_;
717		871
718	my ($w, $h) = ($self->{w}, $self->{h});	872	$self->{view_x} = int $x;
		873	$self->{view_y} = int $y;
719		874
720	glEnable GL_BLEND;	875	$self->update;
721	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	876	}
722	glEnable GL_TEXTURE_2D;
723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724		877
725	# glBegin GL_QUADS;	878	# hmm, this does not work for topleft of $self... but we should not ask for that
726	# glColor 0, 0, 0, 0;	879	sub coord2local {
727	# glVertex 0 , 0;	880	my ($self, $x, $y) = @_;
728	# glVertex 0 , $h;
729	# glVertex $w, $h;
730	# glVertex $w, 0;
731	# glEnd;
732		881
		882	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		883	}
733		884
734	$self->child->draw;	885	sub coord2global {
735	glDisable GL_BLEND;	886	my ($self, $x, $y) = @_;
736	glDisable GL_TEXTURE_2D;	887
		888	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		889	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		890
		891	$self->SUPER::coord2global ($x, $y)
		892	}
		893
		894	sub find_widget {
		895	my ($self, $x, $y) = @_;
		896
		897	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		898	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		899	) {
		900	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		901	} else {
		902	$self->CFClient::UI::Base::find_widget ($x, $y)
		903	}
		904	}
		905
		906	sub _render {
		907	my ($self) = @_;
		908
		909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		910
		911	$self->SUPER::_render;
737	}	912	}
738		913
739	#############################################################################	914	#############################################################################
740		915
741	package CFClient::UI::FancyFrame;	916	package CFClient::UI::ScrolledWindow;
742		917
743	our @ISA = CFClient::UI::Bin::;	918	our @ISA = CFClient::UI::HBox::;
744
745	use CFClient::OpenGL;
746
747	my @tex =
748	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750		919
751	sub new {	920	sub new {
752	my $class = shift;	921	my $class = shift;
753		922
754	# TODO: user_x, user_y, overwrite moveto?	923	my $self;
		924
		925	my $slider = new CFClient::UI::Slider
		926	vertical => 1,
		927	range => [0, 0, 1, 0.01], # HACK fix
		928	on_changed => sub {
		929	$self->{vp}->set_offset (0, $_[1]);
		930	},
		931	;
		932
		933	$self = $class->SUPER::new (
		934	vp => (new CFClient::UI::ViewPort expand => 1),
		935	slider => $slider,
		936	@_,
		937	);
		938
		939	$self->{vp}->add ($self->{scrolled});
		940	$self->add ($self->{vp});
		941	$self->add ($self->{slider});
		942
		943	$self
		944	}
		945
		946	sub update {
		947	my ($self) = @_;
		948
		949	$self->SUPER::update;
		950
		951	# todo: overwrite size_allocate of child
		952	my $child = $self->{vp}->child;
		953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		954	}
		955
		956	sub size_allocate {
		957	my ($self, $w, $h, $changed) = @_;
		958
		959	$self->SUPER::size_allocate ($w, $h, $changed);
		960
		961	my $child = $self->{vp}->child;
		962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		963	}
		964
		965	#TODO# update range on size_allocate depending on child
		966	# update viewport offset on scroll
		967
		968	#############################################################################
		969
		970	package CFClient::UI::Frame;
		971
		972	our @ISA = CFClient::UI::Bin::;
		973
		974	use CFClient::OpenGL;
		975
		976	sub new {
		977	my $class = shift;
		978
		979	$class->SUPER::new (
		980	bg => undef,
		981	@_,
		982	)
		983	}
		984
		985	sub _draw {
		986	my ($self) = @_;
		987
		988	if ($self->{bg}) {
		989	my ($w, $h) = @$self{qw(w h)};
		990
		991	glEnable GL_BLEND;
		992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		993	glColor @{ $self->{bg} };
		994
		995	glBegin GL_QUADS;
		996	glVertex 0 , 0;
		997	glVertex 0 , $h;
		998	glVertex $w, $h;
		999	glVertex $w, 0;
		1000	glEnd;
		1001
		1002	glDisable GL_BLEND;
		1003	}
		1004
		1005	$self->SUPER::_draw;
		1006	}
		1007
		1008	#############################################################################
		1009
		1010	package CFClient::UI::FancyFrame;
		1011
		1012	our @ISA = CFClient::UI::Bin::;
		1013
		1014	use CFClient::OpenGL;
		1015
		1016	my $bg =
		1017	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1018	mipmap => 1, wrap => 1;
		1019
		1020	my @border =
		1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1023
		1024	sub new {
		1025	my $class = shift;
755		1026
756	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
757	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
758	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
759	border => 0.8,	1030	border => 0.6,
760	can_events => 1,	1031	can_events => 1,
761	@_	1032	@_
762	);	1033	);
763		1034
764	$self->{title} &&= new CFClient::UI::Label	1035	$self->{title} &&= new CFClient::UI::Label
765	align => 0,	1036	align => 0,
766	valign => 1,	1037	valign => 1,
767	text => $self->{title},	1038	text => $self->{title},
768	fontsize => 1;	1039	fontsize => $self->{border};
769		1040
770	$self	1041	$self
771	}	1042	}
772		1043
773	sub border {	1044	sub border {
…		…
784	$h + $self->border * 2,	1055	$h + $self->border * 2,
785	)	1056	)
786	}	1057	}
787		1058
788	sub size_allocate {	1059	sub size_allocate {
789	my ($self, $w, $h) = @_;	1060	my ($self, $w, $h, $changed) = @_;
		1061
		1062	return unless $changed;
790		1063
791	$h -= List::Util::max 0, $self->border * 2;	1064	$h -= List::Util::max 0, $self->border * 2;
792	$w -= List::Util::max 0, $self->border * 2;	1065	$w -= List::Util::max 0, $self->border * 2;
793		1066
794	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
795	if $self->{title};	1068	if $self->{title};
796		1069
797	$self->child->configure ($self->border, $self->border, $w, $h);	1070	$self->child->configure ($self->border, $self->border, $w, $h);
798	}	1071	}
799		1072
800	sub button_down {	1073	sub button_down {
801	my ($self, $ev, $x, $y) = @_;	1074	my ($self, $ev, $x, $y) = @_;
802		1075
		1076	my ($w, $h) = @$self{qw(w h)};
803	my $border = $self->border;	1077	my $border = $self->border;
804		1078
805	if ($x < $self->{w} && $x >= $self->{w} - $border	1079	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806	&& $y < $self->{h} && $y >= $self->{h} - $border) {	1080	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807		1081
		1082	if ($lr & $td) {
		1083	my ($wx, $wy) = ($self->{x}, $self->{y});
808	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1084	my ($ox, $oy) = ($ev->{x}, $ev->{y});
809	my ($bw, $bh) = ($self->{w}, $self->{h});	1085	my ($bw, $bh) = ($self->{w}, $self->{h});
810		1086
		1087	my $mx = $x < $border;
		1088	my $my = $y < $border;
		1089
811	$self->{motion} = sub {	1090	$self->{motion} = sub {
812	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
813		1092
814	($x, $y) = ($ev->{x}, $ev->{y});	1093	my $dx = $ev->{x} - $ox;
		1094	my $dy = $ev->{y} - $oy;
815		1095
816	$self->{user_w} = $bw + $x - $ox;	1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817	$self->{user_h} = $bh + $y - $oy;	1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818	$self->check_size;	1098
		1099	$self->realloc;
		1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
819	};	1101	};
820		1102
821	} elsif ($x >= 0 && $x < $self->{w}	1103	} elsif ($lr ^ $td) {
822	&& $y >= 0 && $y < $border) {
823
824	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});
825	my ($bx, $by) = ($self->{x}, $self->{y});	1105	my ($bx, $by) = ($self->{x}, $self->{y});
826		1106
827	$self->{motion} = sub {	1107	$self->{motion} = sub {
828	my ($ev, $x, $y) = @_;	1108	my ($ev, $x, $y) = @_;
829		1109
830	($x, $y) = ($ev->{x}, $ev->{y});	1110	($x, $y) = ($ev->{x}, $ev->{y});
831		1111
832	$self->move ($bx + $x - $ox, $by + $y - $oy);	1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833	$self->update;
834	};	1113	};
835	}	1114	}
836	}	1115	}
837		1116
838	sub button_up {	1117	sub button_up {
…		…
851	my ($self) = @_;	1130	my ($self) = @_;
852		1131
853	my ($w, $h ) = ($self->{w}, $self->{h});	1132	my ($w, $h ) = ($self->{w}, $self->{h});
854	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855		1134
856	glEnable GL_BLEND;
857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858	glEnable GL_TEXTURE_2D;	1135	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860		1137
861	my $border = $self->border;	1138	my $border = $self->border;
862		1139
863	glColor @{ $self->{border_bg} };	1140	glColor @{ $self->{border_bg} };
864	$tex[1]->draw_quad (0, 0, $w, $border);	1141	$border[0]->draw_quad_alpha (0, 0, $w, $border);
865	$tex[3]->draw_quad (0, $border, $border, $ch);	1142	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
866	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1143	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1144	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868		1145
869	my $bg = $tex[0];	1146	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
		1147	glColor @{ $self->{bg} };
870		1148
871	# TODO: repeat texture not scale	1149	# TODO: repeat texture not scale
872	my $rep_x = $cw / $bg->{w};	1150	# solve this better(?)
873	my $rep_y = $ch / $bg->{h};	1151	$bg->{s} = $cw / $bg->{w};
874		1152	$bg->{t} = $ch / $bg->{h};
875	glColor @{ $self->{bg} };
876
877	$bg->{s} = $rep_x;
878	$bg->{t} = $rep_y;
879	$bg->{wrap_mode} = 1;
880	$bg->draw_quad ($border, $border, $cw, $ch);	1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1154	}
881		1155
882	glDisable GL_TEXTURE_2D;	1156	glDisable GL_TEXTURE_2D;
883	glDisable GL_BLEND;
884		1157
885	$self->{title}->draw if $self->{title};	1158	$self->{title}->draw if $self->{title};
		1159
886	$self->child->draw;	1160	$self->child->draw;
887	}	1161	}
888		1162
889	#############################################################################	1163	#############################################################################
890		1164
…		…
899	sub new {	1173	sub new {
900	my $class = shift;	1174	my $class = shift;
901		1175
902	$class->SUPER::new (	1176	$class->SUPER::new (
903	col_expand => [],	1177	col_expand => [],
904	@_	1178	@_,
905	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
906	}	1184	}
907		1185
908	sub add {	1186	sub add {
909	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
910		1188
911	$child->set_parent ($self);	1189	$child->set_parent ($self);
912	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
913		1191
914	$child->check_size;	1192	$self->realloc;
915	}	1193	}
916		1194
917	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
918	sub clear {	1196	sub clear {
919	my ($self) = @_;	1197	my ($self) = @_;
920		1198
921	my $children = delete $self->{children};	1199	my @children = $self->children;
		1200	delete $self->{children};
922		1201
923	for (grep $_, map @$_, grep $_, @$children) {	1202	for (@children) {
924	delete $_->{parent};	1203	delete $_->{parent};
925	$_->hide;	1204	$_->hide;
926	}	1205	}
927		1206
928	$self->update;	1207	$self->realloc;
929	}	1208	}
930		1209
931	sub get_wh {	1210	sub get_wh {
932	my ($self) = @_;	1211	my ($self) = @_;
933		1212
…		…
960	(sum @$hs),	1239	(sum @$hs),
961	)	1240	)
962	}	1241	}
963		1242
964	sub size_allocate {	1243	sub size_allocate {
965	my ($self, $w, $h) = @_;	1244	my ($self, $w, $h, $changed) = @_;
966		1245
967	my ($ws, $hs) = $self->get_wh;	1246	my ($ws, $hs) = $self->get_wh;
968		1247
969	my $req_w = sum @$ws;	1248	my $req_w = (sum @$ws) || 1;
970	my $req_h = sum @$hs;	1249	my $req_h = (sum @$hs) || 1;
971		1250
972	# TODO: nicer code && do row_expand	1251	# TODO: nicer code && do row_expand
973	my @col_expand = @{$self->{col_expand}};	1252	my @col_expand = @{$self->{col_expand}};
974	@col_expand = (1) x @$ws unless @col_expand;	1253	@col_expand = (1) x @$ws unless @col_expand;
975	my $col_expand = (sum @col_expand) || 1;	1254	my $col_expand = (sum @col_expand) || 1;
…		…
1029	}	1308	}
1030	}	1309	}
1031		1310
1032	#############################################################################	1311	#############################################################################
1033		1312
		1313	package CFClient::UI::Box;
		1314
		1315	our @ISA = CFClient::UI::Container::;
		1316
		1317	sub size_request {
		1318	my ($self) = @_;
		1319
		1320	$self->{vertical}
		1321	? (
		1322	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	: (
		1326	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1328	)
		1329	}
		1330
		1331	sub size_allocate {
		1332	my ($self, $w, $h, $changed) = @_;
		1333
		1334	my $space = $self->{vertical} ? $h : $w;
		1335	my $children = $self->{children};
		1336
		1337	my @req;
		1338
		1339	if ($self->{homogeneous}) {
		1340	@req = ($space / (@$children || 1)) x @$children;
		1341	} else {
		1342	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1343	my $req = List::Util::sum @req;
		1344
		1345	if ($req > $space) {
		1346	# ah well, not enough space
		1347	$_ *= $space / $req for @req;
		1348	} else {
		1349	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1350
		1351	$space = ($space - $req) / $expand; # remaining space to give away
		1352
		1353	$req[$_] += $space * $children->[$_]{expand}
		1354	for 0 .. $#$children;
		1355	}
		1356	}
		1357
		1358	CFClient::UI::harmonize \@req;
		1359
		1360	my $pos = 0;
		1361	for (0 .. $#$children) {
		1362	my $alloc = $req[$_];
		1363	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1364
		1365	$pos += $alloc;
		1366	}
		1367
		1368	1
		1369	}
		1370
		1371	#############################################################################
		1372
1034	package CFClient::UI::HBox;	1373	package CFClient::UI::HBox;
1035		1374
1036	# TODO: wrap into common Box base class
1037
1038	our @ISA = CFClient::UI::Container::;	1375	our @ISA = CFClient::UI::Box::;
1039		1376
1040	sub size_request {	1377	sub new {
1041	my ($self) = @_;	1378	my $class = shift;
1042		1379
1043	my @alloc = map [$_->size_request], @{$self->{children}};	1380	$class->SUPER::new (
1044		1381	vertical => 0,
1045	(	1382	@_,
1046	(List::Util::sum map $_->[0], @alloc),
1047	(List::Util::max map $_->[1], @alloc),
1048	)	1383	)
1049	}	1384	}
1050		1385
1051	sub size_allocate {
1052	my ($self, $w, $h) = @_;
1053
1054	($h, $w) = ($w, $h);
1055
1056	my $children = $self->{children};
1057
1058	my @h = map $_->{req_w}, @$children;
1059
1060	my $req_h = List::Util::sum @h;
1061
1062	if ($req_h > $h) {
1063	# ah well, not enough space
1064	$_ *= $h / $req_h for @h;
1065	} else {
1066	my $exp = List::Util::sum map $_->{expand}, @$children;
1067	$exp ||= 1;
1068
1069	for (0 .. $#$children) {
1070	my $child = $children->[$_];
1071
1072	my $alloc_h = $h[$_];
1073	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074	$h[$_] = $alloc_h;
1075	}
1076	}
1077
1078	CFClient::UI::harmonize \@h;
1079
1080	my $y = 0;
1081	for (0 .. $#$children) {
1082	my $child = $children->[$_];
1083	my $h = $h[$_];
1084	$child->configure ($y, 0, $h, $w);
1085
1086	$y += $h;
1087	}
1088
1089	1
1090	}
1091
1092	#############################################################################	1386	#############################################################################
1093		1387
1094	package CFClient::UI::VBox;	1388	package CFClient::UI::VBox;
1095		1389
1096	# TODO: wrap into common Box base class
1097
1098	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Box::;
1099		1391
1100	sub size_request {	1392	sub new {
1101	my ($self) = @_;	1393	my $class = shift;
1102		1394
1103	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$class->SUPER::new (
1104		1396	vertical => 1,
1105	(	1397	@_,
1106	(List::Util::max map $_->[0], @alloc),
1107	(List::Util::sum map $_->[1], @alloc),
1108	)	1398	)
1109	}	1399	}
1110		1400
1111	sub size_allocate {
1112	my ($self, $w, $h) = @_;
1113
1114	my $children = $self->{children};
1115
1116	my @h = map $_->{req_h}, @$children;
1117
1118	my $req_h = List::Util::sum @h;
1119
1120	if ($req_h > $h) {
1121	# ah well, not enough space
1122	$_ *= $h / $req_h for @h;
1123	} else {
1124	my $exp = List::Util::sum map $_->{expand}, @$children;
1125	$exp ||= 1;
1126
1127	for (0 .. $#$children) {
1128	my $child = $children->[$_];
1129
1130	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131	}
1132	}
1133
1134	CFClient::UI::harmonize \@h;
1135
1136	my $y = 0;
1137	for (0 .. $#$children) {
1138	my $child = $children->[$_];
1139	my $h = $h[$_];
1140	$child->configure (0, $y, $w, $h);
1141
1142	$y += $h;
1143	}
1144
1145	1
1146	}
1147
1148	#############################################################################	1401	#############################################################################
1149		1402
1150	package CFClient::UI::Label;	1403	package CFClient::UI::Label;
1151		1404
1152	our @ISA = CFClient::UI::Base::;	1405	our @ISA = CFClient::UI::DrawBG::;
1153		1406
1154	use CFClient::OpenGL;	1407	use CFClient::OpenGL;
1155		1408
1156	sub new {	1409	sub new {
1157	my ($class, %arg) = @_;	1410	my ($class, %arg) = @_;
1158		1411
1159	my $self = $class->SUPER::new (	1412	my $self = $class->SUPER::new (
1160	fg => [1, 1, 1],	1413	fg => [1, 1, 1],
		1414	#bg => none
		1415	#active_bg => none
1161	#font => default_font	1416	#font => default_font
		1417	#text => initial text
		1418	#markup => initial narkup
		1419	#max_w => maximum pixel width
		1420	ellipsise => 3, # end
		1421	layout => (new CFClient::Layout),
1162	fontsize => 1,	1422	fontsize => 1,
1163	text => "",
1164	align => -1,	1423	align => -1,
1165	valign => -1,	1424	valign => -1,
1166	padding => 2,	1425	padding => 2,
1167	layout => new CFClient::Layout,
1168	can_events => 0,	1426	can_events => 0,
1169	%arg	1427	%arg
1170	);	1428	);
1171		1429
1172	if (exists $self->{template}) {	1430	if (exists $self->{template}) {
1173	my $layout = new CFClient::Layout;	1431	my $layout = new CFClient::Layout;
1174	$layout->set_text (delete $self->{template});	1432	$layout->set_text (delete $self->{template});
1175	$self->{template} = $layout;	1433	$self->{template} = $layout;
1176	}	1434	}
1177		1435
1178	$self->set_text (delete $self->{text}) if exists $self->{text};	1436	if (exists $self->{markup}) {
1179	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1437	$self->set_markup (delete $self->{markup});
		1438	} else {
		1439	$self->set_text (delete $self->{text});
		1440	}
1180		1441
1181	$self	1442	$self
1182	}	1443	}
1183		1444
1184	sub escape {	1445	sub escape($) {
1185	local $_ = $_[1];	1446	local $_ = $_[0];
1186		1447
1187	s/&/&amp;/g;	1448	s/&/&amp;/g;
1188	s/>/&gt;/g;	1449	s/>/&gt;/g;
1189	s/</&lt;/g;	1450	s/</&lt;/g;
1190		1451
1191	$_[1]	1452	$_
		1453	}
		1454
		1455	sub update {
		1456	my ($self) = @_;
		1457
		1458	delete $self->{texture};
		1459	$self->SUPER::update;
1192	}	1460	}
1193		1461
1194	sub set_text {	1462	sub set_text {
1195	my ($self, $text) = @_;	1463	my ($self, $text) = @_;
1196		1464
		1465	return if $self->{text} eq "T$text";
		1466	$self->{text} = "T$text";
		1467
		1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197	$self->{layout}->set_text ($text);	1469	$self->{layout}->set_text ($text);
1198		1470
1199	delete $self->{texture};	1471	$self->realloc;
1200	$self->check_size;
1201	$self->update;	1472	$self->update;
1202	}	1473	}
1203		1474
1204	sub set_markup {	1475	sub set_markup {
1205	my ($self, $markup) = @_;	1476	my ($self, $markup) = @_;
1206		1477
		1478	return if $self->{text} eq "M$markup";
		1479	$self->{text} = "M$markup";
		1480
		1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1482
		1483	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207	$self->{layout}->set_markup ($markup);	1484	$self->{layout}->set_markup ($markup);
1208		1485
1209	delete $self->{texture};	1486	$self->realloc;
1210	$self->check_size;
1211	$self->update;	1487	$self->update;
1212	}	1488	}
1213		1489
1214	sub size_request {	1490	sub size_request {
1215	my ($self) = @_;	1491	my ($self) = @_;
1216		1492
1217	$self->{layout}->set_font ($self->{font}) if $self->{font};	1493	$self->{layout}->set_font ($self->{font}) if $self->{font};
1218	$self->{layout}->set_width ($self->{max_w} || -1);	1494	$self->{layout}->set_width ($self->{max_w} || -1);
		1495	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220		1498
1221	my ($w, $h) = $self->{layout}->size;	1499	my ($w, $h) = $self->{layout}->size;
1222		1500
1223	if (exists $self->{template}) {	1501	if (exists $self->{template}) {
…		…
1235	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1236	)	1514	)
1237	}	1515	}
1238		1516
1239	sub size_allocate {	1517	sub size_allocate {
1240	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1241		1519
1242	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1243	}	1522	}
1244		1523
1245	sub set_fontsize {	1524	sub set_fontsize {
1246	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1247		1526
1248	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1249	delete $self->{texture};	1528	delete $self->{texture};
1250	$self->check_size;	1529
1251	$self->update;	1530	$self->realloc;
1252	}	1531	}
1253		1532
1254	sub _draw {	1533	sub _draw {
1255	my ($self) = @_;	1534	my ($self) = @_;
1256		1535
		1536	$self->SUPER::_draw; # draw background, if applicable
		1537
1257	my $tex = $self->{texture} ||= do {	1538	my $tex = $self->{texture} ||= do {
		1539	$self->{layout}->set_foreground (@{$self->{fg}});
1258	$self->{layout}->set_font ($self->{font}) if $self->{font};	1540	$self->{layout}->set_font ($self->{font}) if $self->{font};
1259	$self->{layout}->set_width ($self->{w});	1541	$self->{layout}->set_width ($self->{w});
		1542	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1545
1261	new_from_layout CFClient::Texture $self->{layout}	1546	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1547
		1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1550	: ($self->{w} - $tex->{w}) * 0.5);
		1551
		1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1554	: ($self->{h} - $tex->{h}) * 0.5);
		1555
		1556	$tex
1262	};	1557	};
1263		1558
1264	glEnable GL_BLEND;
1265	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266	glEnable GL_TEXTURE_2D;	1559	glEnable GL_TEXTURE_2D;
1267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268		1561
		1562	if ($tex->{format} == GL_ALPHA) {
1269	glColor @{$self->{fg}};	1563	glColor @{$self->{fg}};
1270
1271	$self->{ox} = int (
1272	$self->{align} < 0 ? $self->{padding}
1273	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274	: ($self->{w} - $tex->{w}) * 0.5
1275	);
1276
1277	$self->{oy} = int (
1278	$self->{valign} < 0 ? $self->{padding}
1279	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280	: ($self->{h} - $tex->{h}) * 0.5
1281	);
1282
1283	$tex->draw_quad ($self->{ox}, $self->{oy});	1564	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1565	} else {
		1566	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1567	}
1284		1568
1285	glDisable GL_TEXTURE_2D;	1569	glDisable GL_TEXTURE_2D;
1286	glDisable GL_BLEND;
1287	}	1570	}
1288		1571
1289	#############################################################################	1572	#############################################################################
1290		1573
1291	package CFClient::UI::EntryBase;	1574	package CFClient::UI::EntryBase;
…		…
1304	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1305	can_hover => 1,	1588	can_hover => 1,
1306	can_focus => 1,	1589	can_focus => 1,
1307	valign => 0,	1590	valign => 0,
1308	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1309	@_	1593	@_
1310	)	1594	)
1311	}	1595	}
1312		1596
1313	sub _set_text {	1597	sub _set_text {
…		…
1323	$self->{text} = $text;	1607	$self->{text} = $text;
1324		1608
1325	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1326	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1327		1611
1328	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
		1613	}
		1614
		1615	sub set_text {
		1616	my ($self, $text) = @_;
		1617
		1618	$self->{cursor} = length $text;
		1619	$self->_set_text ($text);
		1620
		1621	$self->realloc;
1329	}	1622	}
1330		1623
1331	sub get_text {	1624	sub get_text {
1332	$_[0]{text}	1625	$_[0]{text}
1333	}	1626	}
…		…
1336	my ($self) = @_;	1629	my ($self) = @_;
1337		1630
1338	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1339		1632
1340	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1341	}
1342
1343	sub size_allocate {
1344	my ($self, $w, $h) = @_;
1345
1346	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347	}
1348
1349	sub set_text {
1350	my ($self, $text) = @_;
1351
1352	$self->{cursor} = length $text;
1353	$self->_set_text ($text);
1354	$self->update;
1355	}	1634	}
1356		1635
1357	sub key_down {	1636	sub key_down {
1358	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1359		1638
…		…
1361	my $sym = $ev->{sym};	1640	my $sym = $ev->{sym};
1362	my $uni = $ev->{unicode};	1641	my $uni = $ev->{unicode};
1363		1642
1364	my $text = $self->get_text;	1643	my $text = $self->get_text;
1365		1644
1366	if ($sym == 8) {	1645	if ($uni == 8) {
1367	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1646	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368	} elsif ($sym == 127) {	1647	} elsif ($uni == 127) {
1369	substr $text, $self->{cursor}, 1, "";	1648	substr $text, $self->{cursor}, 1, "";
1370	} elsif ($sym == CFClient::SDLK_LEFT) {	1649	} elsif ($sym == CFClient::SDLK_LEFT) {
1371	--$self->{cursor} if $self->{cursor};	1650	--$self->{cursor} if $self->{cursor};
1372	} elsif ($sym == CFClient::SDLK_RIGHT) {	1651	} elsif ($sym == CFClient::SDLK_RIGHT) {
1373	++$self->{cursor} if $self->{cursor} < length $self->{text};	1652	++$self->{cursor} if $self->{cursor} < length $self->{text};
1374	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1375	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1376	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1377	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1378	} elsif ($sym == 27) {	1657	} elsif ($uni == 27) {
1379	$self->emit ('escape');	1658	$self->_emit ('escape');
1380	} elsif ($uni) {	1659	} elsif ($uni) {
1381	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1382	}	1661	}
1383		1662
1384	$self->_set_text ($text);	1663	$self->_set_text ($text);
1385	$self->update;	1664
		1665	$self->realloc;
1386	}	1666	}
1387		1667
1388	sub focus_in {	1668	sub focus_in {
1389	my ($self) = @_;	1669	my ($self) = @_;
1390		1670
…		…
1469		1749
1470	if ($sym == 13) {	1750	if ($sym == 13) {
1471	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1472	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1473	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
		1754	$self->{history_saveback} = '';
1474	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1475	$self->update;	1756	$self->update;
1476		1757
1477	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1478	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1479	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
1480	}	1761	}
		1762	if (@{$self->{history} || []} > 0) {
1481	$self->{history_pointer}++;	1763	$self->{history_pointer}++;
1482	if ($self->{history_pointer} >= @{$self->{history}}) {	1764	if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483	$self->{history_pointer} = @{$self->{history}} - 1;	1765	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1766	}
		1767	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1484	}	1768	}
1485	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1486		1769
1487	} elsif ($sym == CFClient::SDLK_DOWN) {	1770	} elsif ($sym == CFClient::SDLK_DOWN) {
1488	$self->{history_pointer}--;	1771	$self->{history_pointer}--;
1489	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1772	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490		1773
…		…
1516	my $class = shift;	1799	my $class = shift;
1517		1800
1518	$class->SUPER::new (	1801	$class->SUPER::new (
1519	padding => 4,	1802	padding => 4,
1520	fg => [1, 1, 1],	1803	fg => [1, 1, 1],
1521	bg => [1, 1, 1, 0.2],
1522	active_fg => [0, 0, 1],	1804	active_fg => [0, 0, 1],
1523	can_hover => 1,	1805	can_hover => 1,
1524	align => 0,	1806	align => 0,
1525	valign => 0,	1807	valign => 0,
1526	can_events => 1,	1808	can_events => 1,
1527	@_	1809	@_
1528	)	1810	)
1529	}	1811	}
1530		1812
		1813	sub activate { }
		1814
1531	sub button_up {	1815	sub button_up {
1532	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1533		1817
		1818	$self->emit ("activate")
1534	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1535	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1536	$self->emit ("activate");
1537	}
1538	}	1821	}
1539		1822
1540	sub _draw {	1823	sub _draw {
1541	my ($self) = @_;	1824	my ($self) = @_;
1542		1825
…		…
1544		1827
1545	if ($GRAB == $self) {	1828	if ($GRAB == $self) {
1546	$self->{fg} = $self->{active_fg};	1829	$self->{fg} = $self->{active_fg};
1547	}	1830	}
1548		1831
1549	glEnable GL_BLEND;
1550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551	glEnable GL_TEXTURE_2D;	1832	glEnable GL_TEXTURE_2D;
1552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553	glColor 0, 0, 0, 1;	1834	glColor 0, 0, 0, 1;
1554		1835
1555	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1836	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556		1837
1557	glDisable GL_TEXTURE_2D;	1838	glDisable GL_TEXTURE_2D;
1558	glDisable GL_BLEND;
1559		1839
1560	$self->SUPER::_draw;	1840	$self->SUPER::_draw;
1561	}	1841	}
1562		1842
1563	#############################################################################	1843	#############################################################################
…		…
1577		1857
1578	$class->SUPER::new (	1858	$class->SUPER::new (
1579	padding => 2,	1859	padding => 2,
1580	fg => [1, 1, 1],	1860	fg => [1, 1, 1],
1581	active_fg => [1, 1, 0],	1861	active_fg => [1, 1, 0],
		1862	bg => [0, 0, 0, 0.2],
		1863	active_bg => [1, 1, 1, 0.5],
1582	state => 0,	1864	state => 0,
1583	can_hover => 1,	1865	can_hover => 1,
1584	@_	1866	@_
1585	)	1867	)
1586	}	1868	}
…		…
1595	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1596		1878
1597	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1598	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1599	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1600	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1601	}	1883	}
1602	}	1884	}
1603		1885
1604	sub _draw {	1886	sub _draw {
1605	my ($self) = @_;	1887	my ($self) = @_;
…		…
1610		1892
1611	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612		1894
1613	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614		1896
1615	glEnable GL_BLEND;	1897	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1898
1616	glEnable GL_TEXTURE_2D;	1899	glEnable GL_TEXTURE_2D;
1617	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619	my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621	$tex->draw_quad (0, 0, $s, $s);	1900	$tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623	glDisable GL_TEXTURE_2D;	1901	glDisable GL_TEXTURE_2D;
1624	glDisable GL_BLEND;
1625	}	1902	}
1626		1903
1627	#############################################################################	1904	#############################################################################
1628		1905
1629	package CFClient::UI::Image;	1906	package CFClient::UI::Image;
…		…
1672	glTranslate 0, -$self->{w}, 0;	1949	glTranslate 0, -$self->{w}, 0;
1673		1950
1674	($w, $h) = ($h, $w);	1951	($w, $h) = ($h, $w);
1675	}	1952	}
1676		1953
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1954	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681		1956
1682	$tex->draw_quad (0, 0, $w, $h);	1957	$tex->draw_quad_alpha (0, 0, $w, $h);
1683		1958
1684	glDisable GL_BLEND;
1685	glDisable GL_TEXTURE_2D;	1959	glDisable GL_TEXTURE_2D;
1686	}	1960	}
1687		1961
1688	#############################################################################	1962	#############################################################################
1689		1963
…		…
1737	}	2011	}
1738		2012
1739	sub set_max {	2013	sub set_max {
1740	my ($self, $max) = @_;	2014	my ($self, $max) = @_;
1741		2015
		2016	return if $self->{max_val} == $max;
		2017
1742	$self->{max_val} = $max;	2018	$self->{max_val} = $max;
		2019	$self->update;
1743	}	2020	}
1744		2021
1745	sub set_value {	2022	sub set_value {
1746	my ($self, $val, $max) = @_;	2023	my ($self, $val, $max) = @_;
1747		2024
1748	$self->set_max ($max)	2025	$self->set_max ($max)
1749	if defined $max;	2026	if defined $max;
1750		2027
1751	$max = $self->{max_val};	2028	return if $self->{val} == $val;
		2029
1752	$self->{val} = $val;	2030	$self->{val} = $val;
1753
1754	$self->update;	2031	$self->update;
1755	}	2032	}
1756		2033
1757	sub _draw {	2034	sub _draw {
1758	my ($self) = @_;	2035	my ($self) = @_;
…		…
1821		2098
1822	sub new {	2099	sub new {
1823	my ($class, %arg) = @_;	2100	my ($class, %arg) = @_;
1824		2101
1825	my $self = $class->SUPER::new (	2102	my $self = $class->SUPER::new (
1826	tooltip => $arg{type},	2103	tooltip => $arg{type},
1827	can_hover => 1,	2104	can_hover => 1,
		2105	can_events => 1,
1828	%arg,	2106	%arg,
1829	);	2107	);
1830		2108
1831	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2109	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2110	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1840		2118
1841	$self->{value}->set_fontsize ($fsize);	2119	$self->{value}->set_fontsize ($fsize);
1842	$self->{max} ->set_fontsize ($fsize);	2120	$self->{max} ->set_fontsize ($fsize);
1843	}	2121	}
1844		2122
		2123	sub set_max {
		2124	my ($self, $max) = @_;
		2125
		2126	$self->{gauge}->set_max ($max);
		2127	$self->{max}->set_text ($max);
		2128	}
		2129
1845	sub set_value {	2130	sub set_value {
1846	my ($self, $val, $max) = @_;	2131	my ($self, $val, $max) = @_;
1847		2132
1848	$self->set_max ($max)	2133	$self->set_max ($max)
1849	if defined $max;	2134	if defined $max;
1850		2135
1851	$self->{gauge}->set_value ($val, $max);	2136	$self->{gauge}->set_value ($val, $max);
1852	$self->{value}->set_text ($val);	2137	$self->{value}->set_text ($val);
1853	}
1854
1855	sub set_max {
1856	my ($self, $max) = @_;
1857
1858	$self->{gauge}->set_max ($max);
1859	$self->{max}->set_text ($max);
1860	}	2138	}
1861		2139
1862	#############################################################################	2140	#############################################################################
1863		2141
1864	package CFClient::UI::Slider;	2142	package CFClient::UI::Slider;
…		…
1874	qw(s1_slider.png s1_slider_bg.png);	2152	qw(s1_slider.png s1_slider_bg.png);
1875		2153
1876	sub new {	2154	sub new {
1877	my $class = shift;	2155	my $class = shift;
1878		2156
1879	# range [value, low, high, page]	2157	# range [value, low, high, page, unit]
1880		2158
1881	# TODO: 0-width page	2159	# TODO: 0-width page
1882	# TODO: req_w/h are wrong with vertical	2160	# TODO: req_w/h are wrong with vertical
1883	# TODO: calculations are off	2161	# TODO: calculations are off
1884	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
1885	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
1886	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
		2165	bg => [0, 0, 0, 0.2],
		2166	active_bg => [1, 1, 1, 0.5],
1887	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
1888	req_w => 20,	2168	min_w => $::WIDTH / 80,
1889	req_h => 20,	2169	min_h => $::WIDTH / 80,
1890	vertical => 0,	2170	vertical => 0,
1891	can_hover => 1,	2171	can_hover => 1,
1892	inner_pad => 5,	2172	inner_pad => 0.02,
1893	@_	2173	@_
1894	);	2174	);
1895		2175
		2176	$self->set_value ($self->{range}[0]);
		2177	$self->update;
		2178
1896	$self	2179	$self
1897	}	2180	}
1898		2181
		2182	sub changed { }
		2183
		2184	sub set_range {
		2185	my ($self, $range) = @_;
		2186
		2187	($range, $self->{range}) = ($self->{range}, $range);
		2188
		2189	$self->update
		2190	if "@$range" ne "@{$self->{range}}";
		2191	}
		2192
		2193	sub set_value {
		2194	my ($self, $value) = @_;
		2195
		2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2197
		2198	$hi = $lo + 1 if $hi <= $lo;
		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
		2202	$value = $lo if $value < $lo;
		2203	$value = $hi - $page if $value > $hi - $page;
		2204
		2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2206	if $unit;
		2207
		2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2209
		2210	if ($value != $old_value) {
		2211	$self->_emit (changed => $value);
		2212	$self->update;
		2213	}
		2214	}
		2215
1899	sub size_request {	2216	sub size_request {
1900	my ($self) = @_;	2217	my ($self) = @_;
1901		2218
1902	my $w = $self->{req_w};	2219	($self->{req_w}, $self->{req_h})
1903	my $h = $self->{req_h};
1904
1905	$self->{vertical} ? ($h, $w) : ($w, $h)
1906	}	2220	}
1907		2221
1908	sub button_down {	2222	sub button_down {
1909	my ($self, $ev, $x, $y) = @_;	2223	my ($self, $ev, $x, $y) = @_;
1910		2224
1911	$self->SUPER::button_down ($ev, $x, $y);	2225	$self->SUPER::button_down ($ev, $x, $y);
		2226
		2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2228
1912	$self->mouse_motion ($ev, $x, $y);	2229	$self->mouse_motion ($ev, $x, $y);
1913	}	2230	}
1914		2231
1915	sub mouse_motion {	2232	sub mouse_motion {
1916	my ($self, $ev, $x, $y) = @_;	2233	my ($self, $ev, $x, $y) = @_;
1917		2234
1918	if ($GRAB == $self) {	2235	if ($GRAB == $self) {
		2236	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2237
		2238	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2239
		2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2241
		2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2243	}
		2244	}
		2245
		2246	sub update {
		2247	my ($self) = @_;
		2248
		2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2250	$self->set_value ($self->{range}[0]);
		2251
1919	my ($value, $lo, $hi, $page) = @{$self->{range}};	2252	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2253	my $range = ($hi - $page - $lo) || 1e-100;
1920		2254
1921	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2255	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922		2256
1923	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2257	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2258	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925		2259
1926	$x -= $inner_pad_px; # substract the padding	2260	$value = ($value - $lo) / $range;
1927	$x = $x * ($hi - $lo) / $inner_w + $lo;	2261	$value = $value * $self->{scale} + $self->{offset};
1928	$x = $lo if $x < $lo;
1929	$x = $hi - $page if $x > $hi - $page;
1930	$self->{range}[0] = $x;
1931		2262
1932	$self->emit (changed => $x);	2263	$self->{knob_x} = $value - $knob_w * 0.5;
1933	$self->update;	2264	$self->{knob_w} = $knob_w;
1934	}	2265	});
1935	}
1936		2266
1937	# the inner_* stuff is for generating a padding for the slider handle,	2267	$self->SUPER::update;
1938	# so that the handle doesn't leave the texture. This calculation isn't 100%
1939	# correct propably, but it does the job for now
1940	sub _calc_inner_pad_px {
1941	my ($self, $w) = @_;
1942	($w / 100) * $self->{inner_pad} # % to pixels
1943	}	2268	}
1944		2269
1945	sub _draw {	2270	sub _draw {
1946	my ($self) = @_;	2271	my ($self) = @_;
1947		2272
1948	$self->SUPER::_draw ();	2273	$self->SUPER::_draw ();
1949		2274
1950	my ($w, $h) = @$self{qw(w h)};	2275	glScale $self->{w}, $self->{h};
1951		2276
1952	if ($self->{vertical}) {	2277	if ($self->{vertical}) {
1953	# draw a vertical slider like a rotated horizontal slider	2278	# draw a vertical slider like a rotated horizontal slider
1954		2279
		2280	glTranslate 1, 0, 0;
1955	glRotate 90, 0, 0, 1;	2281	glRotate 90, 0, 0, 1;
1956	glTranslate 0, -$self->{w}, 0;
1957
1958	($w, $h) = ($h, $w);
1959	}	2282	}
1960		2283
1961	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2284	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2285	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963		2286
1964	my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966	$hi = $value + 1 if $lo == $hi;
1967
1968	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971	$page = int $page * $inner_w / ($hi - $lo);
1972	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974	$w -= $page;
1975	$page &= ~1;
1976	glTranslate $page * 0.5, 0, 0;
1977	$page ||= 2;
1978
1979	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982	glEnable GL_BLEND;
1983	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984	glEnable GL_TEXTURE_2D;	2287	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2288	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986		2289
1987	# draw background	2290	# draw background
1988	$tex[1]->draw_quad (0, 0, $w, $h);	2291	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989		2292
1990	# draw handle	2293	# draw handle
1991	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2294	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992		2295
1993	glDisable GL_BLEND;
1994	glDisable GL_TEXTURE_2D;	2296	glDisable GL_TEXTURE_2D;
1995	}	2297	}
		2298
		2299	#############################################################################
		2300
		2301	package CFClient::UI::ValSlider;
		2302
		2303	our @ISA = CFClient::UI::HBox::;
		2304
		2305	sub new {
		2306	my ($class, %arg) = @_;
		2307
		2308	my $range = delete $arg{range};
		2309
		2310	my $self = $class->SUPER::new (
		2311	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2312	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2313	to_value => sub { shift },
		2314	from_value => sub { shift },
		2315	%arg,
		2316	);
		2317
		2318	$self->{slider}->connect (changed => sub {
		2319	my ($self, $value) = @_;
		2320	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2321	$self->{parent}->emit (changed => $value);
		2322	});
		2323
		2324	# $self->{entry}->connect (changed => sub {
		2325	# my ($self, $value) = @_;
		2326	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2327	# $self->{parent}->emit (changed => $value);
		2328	# });
		2329
		2330	$self->add ($self->{slider}, $self->{entry});
		2331
		2332	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2333
		2334	$self
		2335	}
		2336
		2337	sub set_range { shift->{slider}->set_range (@_) }
		2338	sub set_value { shift->{slider}->set_value (@_) }
1996		2339
1997	#############################################################################	2340	#############################################################################
1998		2341
1999	package CFClient::UI::TextView;	2342	package CFClient::UI::TextView;
2000		2343
…		…
2009	fontsize => 1,	2352	fontsize => 1,
2010	can_events => 0,	2353	can_events => 0,
2011	#font => default_font	2354	#font => default_font
2012	@_,	2355	@_,
2013		2356
2014	layout => (new CFClient::Layout),	2357	layout => (new CFClient::Layout 1),
2015	par => [],	2358	par => [],
2016	height => 0,	2359	height => 0,
2017	children => [	2360	children => [
2018	(new CFClient::UI::Empty expand => 1),	2361	(new CFClient::UI::Empty expand => 1),
2019	(new CFClient::UI::Slider vertical => 1),	2362	(new CFClient::UI::Slider vertical => 1),
2020	],	2363	],
2021	);	2364	);
2022		2365
2023	$self->{children}[1]->connect (changed => sub {	2366	$self->{children}[1]->connect (changed => sub { $self->update });
2024	$self->update;
2025	});
2026		2367
2027	$self	2368	$self
2028	}	2369	}
2029		2370
2030	sub set_fontsize {	2371	sub set_fontsize {
…		…
2032		2373
2033	$self->{fontsize} = $fontsize;	2374	$self->{fontsize} = $fontsize;
2034	$self->reflow;	2375	$self->reflow;
2035	}	2376	}
2036		2377
2037	sub text_height {
2038	my ($self, $text) = @_;
2039
2040	my $layout = $self->{layout};
2041
2042	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043	$layout->set_width ($self->{w});
2044	$layout->set_text ($text);
2045
2046	($layout->size)[1]
2047	}
2048
2049	sub reflow {
2050	my ($self) = @_;
2051
2052	$self->{need_reflow}++;
2053	$self->update;
2054	}
2055
2056	sub size_allocate {	2378	sub size_allocate {
2057	my ($self, $w, $h) = @_;	2379	my ($self, $w, $h, $changed) = @_;
2058		2380
2059	$self->SUPER::size_allocate ($w, $h);	2381	$self->SUPER::size_allocate ($w, $h, $changed);
		2382
		2383	return unless $changed;
2060		2384
2061	$self->{layout}->set_font ($self->{font}) if $self->{font};	2385	$self->{layout}->set_font ($self->{font}) if $self->{font};
2062	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2063	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2064		2388
2065	$self->reflow;	2389	$self->reflow;
2066	}	2390	}
2067		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2068	sub add_paragraph {	2426	sub add_paragraph {
2069	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2070		2428
2071	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2072		2430	my ($w, $h) = $self->text_size ($line);
2073	my $height = $self->text_height ($text);
2074
2075	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2076		2434
2077	push @{$self->{par}}, [$height, $color, $text];
2078
2079	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2080	$self->{children}[1]->update;
2081	}	2436	}
2082		2437
2083	sub update {	2438	sub update {
2084	my ($self) = @_;	2439	my ($self) = @_;
2085		2440
…		…
2087		2442
2088	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2089		2444
2090	delete $self->{texture};	2445	delete $self->{texture};
2091		2446
2092	$ROOT->on_refresh ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2093	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2094	my $height = 0;	2451	my $height = 0;
2095		2452
2096	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2097	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2098		2468
2099	$self->{height} = $height;	2469	$self->{height} = $height;
2100		2470
2101	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2102		2472
2103	delete $self->{texture};	2473	delete $self->{texture};
2104	}	2474	}
2105		2475
2106	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2107	glClearColor 0, 0, 0, 1;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2108	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2109		2479
		2480	my $top = int $self->{children}[1]{range}[0];
		2481
		2482	my $y0 = $top;
		2483	my $y1 = $top + $H;
		2484
		2485	my $y = 0;
		2486
		2487	my $layout = $self->{layout};
		2488
		2489	$layout->set_font ($self->{font}) if $self->{font};
		2490
2110	glEnable GL_BLEND;	2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
2111	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2112	glEnable GL_TEXTURE_2D;
2113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115	my $top = int $self->{children}[1]{range}[0];
2116
2117	my $y0 = $top;
2118	my $y1 = $top + $self->{h};
2119
2120	my $y = 0;
2121
2122	my $layout = $self->{layout};
2123
2124	$layout->set_font ($self->{font}) if $self->{font};
2125		2494
2126	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2127	my $h = $par->[0];	2496	my $h = $par->[1];
2128		2497
2129	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
		2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2130	$layout->set_text ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2131		2502
2132	glColor @{ $par->[1] };	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133	my ($W, $H) = $layout->size;	2504
2134	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2135	}	2507	}
2136		2508
2137	$y += $h;	2509	$y += $h;
2138	}	2510	}
2139		2511
2140	glDisable GL_TEXTURE_2D;
2141	glDisable GL_BLEND;	2512	glDisable GL_BLEND;
2142	};	2513	};
2143	});	2514	});
2144	}	2515	}
2145		2516
2146	sub _draw {	2517	sub _draw {
2147	my ($self) = @_;	2518	my ($self) = @_;
2148		2519
2149	if ($self->{texture}) {
2150	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2522	glColor 1, 1, 1, 1;
2152	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153	glDisable GL_TEXTURE_2D;	2524	glDisable GL_TEXTURE_2D;
2154	}
2155		2525
2156	$self->{children}[1]->draw;	2526	$self->{children}[1]->draw;
2157		2527
2158	}	2528	}
2159		2529
…		…
2207		2577
2208	sub new {	2578	sub new {
2209	my $class = shift;	2579	my $class = shift;
2210		2580
2211	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2212	state => 0,	2582	state => 0,
2213	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2214	@_	2584	@_
2215	);	2585	);
2216		2586
2217	if ($self->{state}) {
2218	$self->{state} = 0;
2219	$self->toggle_flopper;
2220	}
2221
2222	$self	2587	$self
2223	}	2588	}
2224		2589
2225	sub toggle_flopper {	2590	sub toggle_flopper {
2226	my ($self) = @_;	2591	my ($self) = @_;
2227		2592
2228	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2229	if ($self->{state} = !$self->{state}) {
2230	$CFClient::UI::ROOT->add ($self->{other});
2231	$self->{other}->move ($self->coord2global (0, $self->{h}));
2232	$self->emit ("open");
2233	} else {
2234	$CFClient::UI::ROOT->remove ($self->{other});
2235	$self->emit ("close");
2236	}
2237
2238	$self->emit (changed => $self->{state});
2239	}	2594	}
2240		2595
2241	#############################################################################	2596	#############################################################################
2242		2597
2243	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2253	@_,	2608	@_,
2254	can_events => 0,	2609	can_events => 0,
2255	)	2610	)
2256	}	2611	}
2257		2612
2258	sub set_markup {	2613	sub set_tooltip_from {
2259	my ($self, $text) = @_;	2614	my ($self, $widget) = @_;
2260		2615
2261	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2616	$self->add (new CFClient::UI::Label
2262	$self->{label}->set_markup ($text);	2617	markup => $widget->{tooltip},
2263	$self->add ($self->{label});	2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2619	fontsize => 0.8,
		2620	fg => [0, 0, 0, 1],
		2621	ellipsise => 0,
		2622	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2623	);
2264	}	2624	}
2265		2625
2266	sub size_request {	2626	sub size_request {
2267	my ($self) = @_;	2627	my ($self) = @_;
2268		2628
2269	$self->child->set_max_size ($::WIDTH * 0.3);
2270
2271	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2629	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272		2630
2273	($w + 4, $h + 4)	2631	($w + 4, $h + 4)
2274	}	2632	}
2275		2633
2276	sub size_allocate {	2634	sub size_allocate {
2277	my ($self, $w, $h) = @_;	2635	my ($self, $w, $h, $changed) = @_;
2278		2636
		2637	return unless $changed;
		2638
2279	$self->SUPER::size_allocate ($w - 4, $h - 4);	2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2640	}
		2641
		2642	sub visibility_change {
		2643	my ($self, $visible) = @_;
		2644
		2645	return unless $visible;
		2646
		2647	$self->{root}->on_post_alloc ("move_$self" => sub {
		2648	my $widget = $self->{owner}
		2649	or return;
		2650
		2651	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2652
		2653	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2654	if $x + $self->{w} > $::WIDTH;
		2655
		2656	$self->move_abs ($x, $y);
		2657	});
2280	}	2658	}
2281		2659
2282	sub _draw {	2660	sub _draw {
2283	my ($self) = @_;	2661	my ($self) = @_;
2284		2662
2285	glPushMatrix;
2286	glTranslate 0.375, 0.375;	2663	glTranslate 0.375, 0.375;
2287		2664
2288	my ($w, $h) = @$self{qw(w h)};	2665	my ($w, $h) = @$self{qw(w h)};
2289		2666
2290	glColor 1, 0.8, 0.4;	2667	glColor 1, 0.8, 0.4;
…		…
2301	glVertex 0 , $h;	2678	glVertex 0 , $h;
2302	glVertex $w, $h;	2679	glVertex $w, $h;
2303	glVertex $w, 0;	2680	glVertex $w, 0;
2304	glEnd;	2681	glEnd;
2305		2682
2306	glPopMatrix;	2683	glTranslate 2 - 0.375, 2 - 0.375;
2307		2684
2308	glTranslate 2, 2;
2309	$self->SUPER::_draw;	2685	$self->SUPER::_draw;
2310	}	2686	}
2311		2687
2312	#############################################################################	2688	#############################################################################
2313		2689
…		…
2318	use CFClient::OpenGL;	2694	use CFClient::OpenGL;
2319		2695
2320	sub new {	2696	sub new {
2321	my $class = shift;	2697	my $class = shift;
2322		2698
2323	$class->SUPER::new (	2699	my $self = $class->SUPER::new (
2324	aspect => 1,	2700	aspect => 1,
		2701	can_events => 0,
2325	@_,	2702	@_,
2326	)	2703	);
		2704
		2705	if ($self->{anim} && $self->{animspeed}) {
		2706	Scalar::Util::weaken (my $widget = $self);
		2707
		2708	$self->{timer} = Event->timer (
		2709	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2710	hard => 1,
		2711	interval => $self->{animspeed},
		2712	cb => sub {
		2713	++$widget->{frame};
		2714	$widget->update;
		2715	},
		2716	);
		2717	}
		2718
		2719	$self
2327	}	2720	}
2328		2721
2329	sub size_request {	2722	sub size_request {
2330	(32, 8)	2723	(32, 8)
2331	}	2724	}
2332		2725
		2726	sub update {
		2727	my ($self) = @_;
		2728
		2729	return unless $self->{visible};
		2730
		2731	$self->SUPER::update;
		2732	}
		2733
2333	sub draw {	2734	sub _draw {
2334	my ($self) = @_;	2735	my ($self) = @_;
2335		2736
		2737	return unless $::CONN;
		2738
		2739	my $face;
		2740
		2741	if ($self->{frame}) {
		2742	my $anim = $::CONN->{anim}[$self->{anim}];
		2743
		2744	$face = $anim->[ $self->{frame} % @$anim ]
		2745	if $anim && @$anim;
		2746	}
		2747
2336	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2748	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337		2749
2338	if ($tex) {	2750	if ($tex) {
2339	glEnable GL_BLEND;
2340	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341	glEnable GL_TEXTURE_2D;	2751	glEnable GL_TEXTURE_2D;
2342	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2752	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343	glColor 1, 1, 1, 1;	2753	glColor 1, 1, 1, 1;
2344	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2754	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345	glDisable GL_TEXTURE_2D;	2755	glDisable GL_TEXTURE_2D;
2346	glDisable GL_BLEND;
2347	}	2756	}
		2757	}
		2758
		2759	sub DESTROY {
		2760	my ($self) = @_;
		2761
		2762	$self->{timer}->cancel
		2763	if $self->{timer};
		2764
		2765	$self->SUPER::DESTROY;
2348	}	2766	}
2349		2767
2350	#############################################################################	2768	#############################################################################
2351		2769
		2770	package CFClient::UI::Inventory;
		2771
		2772	our @ISA = CFClient::UI::ScrolledWindow::;
		2773
		2774	sub new {
		2775	my $class = shift;
		2776
		2777	my $self = $class->SUPER::new (
		2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2779	@_,
		2780	);
		2781
		2782	$self
		2783	}
		2784
		2785	sub set_items {
		2786	my ($self, $items) = @_;
		2787
		2788	$self->{scrolled}->clear;
		2789	return unless $items;
		2790
		2791	my @items = sort {
		2792	($a->{type} <=> $b->{type})
		2793	or ($a->{name} cmp $b->{name})
		2794	} @$items;
		2795
		2796	$self->{real_items} = \@items;
		2797
		2798	my $row = 0;
		2799	for my $item (@items) {
		2800	CFClient::Item::update_widgets $item;
		2801
		2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2805
		2806	$row++;
		2807	}
		2808	}
		2809
		2810	#############################################################################
		2811
		2812	package CFClient::UI::Menu;
		2813
		2814	our @ISA = CFClient::UI::FancyFrame::;
		2815
		2816	use CFClient::OpenGL;
		2817
		2818	sub new {
		2819	my $class = shift;
		2820
		2821	my $self = $class->SUPER::new (
		2822	items => [],
		2823	z => 100,
		2824	@_,
		2825	);
		2826
		2827	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2828
		2829	for my $item (@{ $self->{items} }) {
		2830	my ($widget, $cb) = @$item;
		2831
		2832	# handle various types of items, only text for now
		2833	if (!ref $widget) {
		2834	$widget = new CFClient::UI::Label
		2835	can_hover => 1,
		2836	can_events => 1,
		2837	text => $widget;
		2838	}
		2839
		2840	$self->{item}{$widget} = $item;
		2841
		2842	$self->{vbox}->add ($widget);
		2843	}
		2844
		2845	$self
		2846	}
		2847
		2848	# popup given the event (must be a mouse button down event currently)
		2849	sub popup {
		2850	my ($self, $ev) = @_;
		2851
		2852	$self->_emit ("popdown");
		2853
		2854	# maybe save $GRAB? must be careful about events...
		2855	$GRAB = $self;
		2856	$self->{button} = $ev->{button};
		2857
		2858	$self->show;
		2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2860	}
		2861
		2862	sub mouse_motion {
		2863	my ($self, $ev, $x, $y) = @_;
		2864
		2865	# TODO: should use vbox->find_widget or so
		2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2867	$self->{hover} = $self->{item}{$HOVER};
		2868	}
		2869
		2870	sub button_up {
		2871	my ($self, $ev, $x, $y) = @_;
		2872
		2873	if ($ev->{button} == $self->{button}) {
		2874	undef $GRAB;
		2875	$self->hide;
		2876
		2877	$self->_emit ("popdown");
		2878	$self->{hover}[1]->() if $self->{hover};
		2879	}
		2880	}
		2881
		2882	#############################################################################
		2883
		2884	package CFClient::UI::Statusbox;
		2885
		2886	our @ISA = CFClient::UI::VBox::;
		2887
		2888	sub new {
		2889	my $class = shift;
		2890
		2891	$class->SUPER::new (
		2892	fontsize => 0.8,
		2893	@_,
		2894	)
		2895	}
		2896
		2897	sub reorder {
		2898	my ($self) = @_;
		2899	my $NOW = time;
		2900
		2901	while (my ($k, $v) = each %{ $self->{item} }) {
		2902	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2903	}
		2904
		2905	my @widgets;
		2906
		2907	my @items = sort {
		2908	$a->{pri} <=> $b->{pri}
		2909	or $b->{id} <=> $a->{id}
		2910	} values %{ $self->{item} };
		2911
		2912	my $count = 10 + 1;
		2913	for my $item (@items) {
		2914	last unless --$count;
		2915
		2916	push @widgets, $item->{label} ||= do {
		2917	# TODO: doesn't handle markup well (read as: at all)
		2918	my $short = $item->{count} > 1
		2919	? "<b>$item->{count} ×</b> $item->{text}"
		2920	: $item->{text};
		2921
		2922	for ($short) {
		2923	s/^\s+//;
		2924	s/\s+/ /g;
		2925	}
		2926
		2927	new CFClient::UI::Label
		2928	markup => $short,
		2929	tooltip => $item->{tooltip},
		2930	tooltip_font => $::FONT_PROP,
		2931	tooltip_width => 0.67,
		2932	fontsize => $item->{fontsize} || $self->{fontsize},
		2933	max_w => $::WIDTH * 0.44,
		2934	fg => $item->{fg},
		2935	can_events => 1,
		2936	can_hover => 1
		2937	};
		2938	}
		2939
		2940	$self->clear;
		2941	$self->SUPER::add (reverse @widgets);
		2942	}
		2943
		2944	sub add {
		2945	my ($self, $text, %arg) = @_;
		2946
		2947	$text =~ s/^\s+//;
		2948	$text =~ s/\s+$//;
		2949
		2950	return unless $text;
		2951
		2952	my $timeout = time + ((delete $arg{timeout}) || 60);
		2953
		2954	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2955
		2956	if (my $item = $self->{item}{$group}) {
		2957	if ($item->{text} eq $text) {
		2958	$item->{count}++;
		2959	} else {
		2960	$item->{count} = 1;
		2961	$item->{text} = $item->{tooltip} = $text;
		2962	}
		2963	$item->{id} = ++$self->{id};
		2964	$item->{timeout} = $timeout;
		2965	delete $item->{label};
		2966	} else {
		2967	$self->{item}{$group} = {
		2968	id => ++$self->{id},
		2969	text => $text,
		2970	timeout => $timeout,
		2971	tooltip => $text,
		2972	fg => [0.8, 0.8, 0.8, 0.8],
		2973	pri => 0,
		2974	count => 1,
		2975	%arg,
		2976	};
		2977	}
		2978
		2979	$self->reorder;
		2980	}
		2981
		2982	sub reconfigure {
		2983	my ($self) = @_;
		2984
		2985	delete $_->{label}
		2986	for values %{ $self->{item} || {} };
		2987
		2988	$self->reorder;
		2989	$self->SUPER::reconfigure;
		2990	}
		2991
		2992	#############################################################################
		2993
2352	package CFClient::UI::Root;	2994	package CFClient::UI::Root;
2353		2995
2354	our @ISA = CFClient::UI::Container::;	2996	our @ISA = CFClient::UI::Container::;
2355		2997
2356	use CFClient::OpenGL;	2998	use CFClient::OpenGL;
2357		2999
2358	sub check_size {	3000	sub new {
2359	my ($self) = @_;	3001	my $class = shift;
2360		3002
2361	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3003	my $self = $class->SUPER::new (
2362	}	3004	visible => 1,
		3005	@_,
		3006	);
2363		3007
2364	sub size_request {	3008	Scalar::Util::weaken ($self->{root} = $self);
2365	($::WIDTH, $::HEIGHT)	3009
		3010	$self
2366	}	3011	}
2367		3012
2368	sub configure {	3013	sub configure {
2369	my ($self, $x, $y, $w, $h) = @_;	3014	my ($self, $x, $y, $w, $h) = @_;
2370		3015
2371	$self->SUPER::configure ($x, $y, $w, $h);	3016	$self->{w} = $w;
		3017	$self->{h} = $h;
		3018	}
2372		3019
		3020	sub reconfigure {
		3021	my ($self) = @_;
		3022
		3023	$self->SUPER::reconfigure;
		3024
		3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
		3026	if $self->{w};
		3027	}
		3028
		3029	sub size_request {
		3030	my ($self) = @_;
		3031
		3032	($self->{w}, $self->{h})
		3033	}
		3034
		3035	sub _to_pixel {
		3036	my ($coord, $size, $max) = @_;
		3037
		3038	$coord =
		3039	$coord eq "center" ? ($max - $size) * 0.5
		3040	: $coord eq "max" ? $max
		3041	: $coord;
		3042
		3043	$coord = 0 if $coord < 0;
		3044	$coord = $max - $size if $coord > $max - $size;
		3045
		3046	int $coord + 0.5
		3047	}
		3048
		3049	sub size_allocate {
		3050	my ($self, $w, $h, $changed) = @_;
		3051
2373	for my $child (@{$self->{children}}) {	3052	for my $child ($self->children) {
2374	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375		3054
2376	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3055	$X = $child->{force_x} if exists $child->{force_x};
2377	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3056	$Y = $child->{force_y} if exists $child->{force_y};
		3057
		3058	$X = _to_pixel $X, $W, $self->{w};
		3059	$Y = _to_pixel $Y, $H, $self->{h};
		3060
2378	$child->configure ($X, $Y, $W,$H);	3061	$child->configure ($X, $Y, $W, $H);
2379	}	3062	}
2380	}	3063	}
2381		3064
2382	sub _topleft {	3065	sub coord2local {
2383	my ($self, $x, $y) = @_;	3066	my ($self, $x, $y) = @_;
2384		3067
2385	($x, $y)	3068	($x, $y)
2386	}	3069	}
2387		3070
		3071	sub coord2global {
		3072	my ($self, $x, $y) = @_;
		3073
		3074	($x, $y)
		3075	}
		3076
2388	sub update {	3077	sub update {
2389	my ($self) = @_;	3078	my ($self) = @_;
2390		3079
2391	$self->check_size;	3080	$::WANT_REFRESH++;
2392	::refresh ();
2393	}	3081	}
2394		3082
2395	sub add {	3083	sub add {
2396	my ($self, $child) = @_;	3084	my ($self, @children) = @_;
2397		3085
2398	# integerize window positions	3086	$_->{is_toplevel} = 1
2399	$child->{x} = int $child->{x};	3087	for @children;
2400	$child->{y} = int $child->{y};
2401		3088
2402	$self->SUPER::add ($child);	3089	$self->SUPER::add (@children);
		3090	}
		3091
		3092	sub remove {
		3093	my ($self, @children) = @_;
		3094
		3095	$self->SUPER::remove (@children);
		3096
		3097	delete $self->{is_toplevel}
		3098	for @children;
		3099
		3100	while (@children) {
		3101	my $w = pop @children;
		3102	push @children, $w->children;
		3103	$w->set_invisible;
		3104	}
2403	}	3105	}
2404		3106
2405	sub on_refresh {	3107	sub on_refresh {
2406	my ($self, $id, $cb) = @_;	3108	my ($self, $id, $cb) = @_;
2407		3109
2408	$self->{refresh_hook}{$id} = $cb;	3110	$self->{refresh_hook}{$id} = $cb;
2409	}	3111	}
2410		3112
		3113	sub on_post_alloc {
		3114	my ($self, $id, $cb) = @_;
		3115
		3116	$self->{post_alloc_hook}{$id} = $cb;
		3117	}
		3118
2411	sub draw {	3119	sub draw {
2412	my ($self) = @_;	3120	my ($self) = @_;
2413		3121
2414	while (my $rcb = delete $self->{refresh_hook}) {	3122	while ($self->{refresh_hook}) {
2415	$_->() for values %$rcb;	3123	$_->()
		3124	for values %{delete $self->{refresh_hook}};
		3125	}
		3126
		3127	if ($self->{realloc}) {
		3128	my @queue;
		3129
		3130	while () {
		3131	if ($self->{realloc}) {
		3132	#TODO use array-of-depth approach
		3133
		3134	@queue = sort { $a->{visible} <=> $b->{visible} }
		3135	@queue, values %{delete $self->{realloc}};
		3136	}
		3137
		3138	my $widget = pop @queue || last;
		3139
		3140	$widget->{visible} or last; # do not resize invisible widgets
		3141
		3142	my ($w, $h) = $widget->size_request;
		3143
		3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
		3145
		3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
		3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
		3148
		3149	$w = $widget->{force_w} if exists $widget->{force_w};
		3150	$h = $widget->{force_h} if exists $widget->{force_h};
		3151
		3152	$widget->{req_w} = $w;
		3153	$widget->{req_h} = $h;
		3154
		3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];
		3156
		3157	push @queue, $widget->{parent}
		3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
		3159	}
		3160	}
		3161
		3162	while (my $size_alloc = delete $self->{size_alloc}) {
		3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
		3164	values %$size_alloc;
		3165
		3166	while () {
		3167	my ($widget, $w, $h) = @{ pop @queue or last };
		3168
		3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
		3171
		3172	$w = 0 if $w < 0;
		3173	$h = 0 if $h < 0;
		3174
		3175	$w = int $w + 0.5;
		3176	$h = int $h + 0.5;
		3177
		3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3179
		3180	$widget->{w} = $w;
		3181	$widget->{h} = $h;
		3182
		3183	$widget->emit (size_allocate => $w, $h, $changed);
		3184	}
		3185	}
		3186
		3187	while ($self->{post_alloc_hook}) {
		3188	$_->()
		3189	for values %{delete $self->{post_alloc_hook}};
2416	}	3190	}
2417		3191
2418	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420	glClear GL_COLOR_BUFFER_BIT;	3194	glClear GL_COLOR_BUFFER_BIT;
2421		3195
2422	glMatrixMode GL_PROJECTION;	3196	glMatrixMode GL_PROJECTION;
2423	glLoadIdentity;	3197	glLoadIdentity;
2424	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425	glMatrixMode GL_MODELVIEW;	3199	glMatrixMode GL_MODELVIEW;
2426	glLoadIdentity;	3200	glLoadIdentity;
2427		3201
2428	$self->_draw;	3202	$self->_draw;
2429	}	3203	}
…		…
2431	#############################################################################	3205	#############################################################################
2432		3206
2433	package CFClient::UI;	3207	package CFClient::UI;
2434		3208
2435	$ROOT = new CFClient::UI::Root;	3209	$ROOT = new CFClient::UI::Root;
2436	$TOOLTIP = new CFClient::UI::Tooltip;	3210	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437		3211
2438	1	3212	1
2439		3213

Diff Legend

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