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

Diff Legend

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