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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		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	}
18		40
19	sub check_tooltip {	41	sub check_tooltip {
20	if (!$GRAB) {	42	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	44	if (length $widget->{tooltip}) {
23		45
24	if ($TOOLTIP->{owner} != $widget) {	46	if ($TOOLTIP->{owner} != $widget) {
		47	$TOOLTIP->hide;
		48
25	$TOOLTIP->{owner} = $widget;	49	$TOOLTIP->{owner} = $widget;
26		50
27	my $tip = $widget->{tooltip};	51	my $tip = $widget->{tooltip};
28		52
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	53	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		54
31	$TOOLTIP->set_tooltip_from ($widget);	55	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	56	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	57	}
43		58
44	return;	59	return;
45	}	60	}
46	}	61	}
…		…
50	delete $TOOLTIP->{owner};	65	delete $TOOLTIP->{owner};
51	}	66	}
52		67
53	# class methods for events	68	# class methods for events
54	sub feed_sdl_key_down_event {	69	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	70	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	71	if $FOCUS;
57	}	72	}
58		73
59	sub feed_sdl_key_up_event {	74	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	75	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	76	if $FOCUS;
62	}	77	}
63		78
64	sub feed_sdl_button_down_event {	79	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	80	my ($ev) = @_;
…		…
74	check_tooltip;	89	check_tooltip;
75	}	90	}
76		91
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	92	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		93
79	if ($GRAB) {	94	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	95	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	96	}
84		97
85	sub feed_sdl_button_up_event {	98	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	99	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
88		101
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	102	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		103
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	104	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		105
93	if ($GRAB) {	106	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	107	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		108
98	if (!$BUTTON_STATE) {	109	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	110	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	111	$grab->update if $grab;
101	$GRAB->update if $GRAB;	112	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	128	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		129
119	check_tooltip;	130	check_tooltip;
120	}	131	}
121		132
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	133	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	134	if $HOVER;
126	}	135	}
127		136
128	# convert position array to integers	137	# convert position array to integers
129	sub harmonize {	138	sub harmonize {
130	my ($vals) = @_;	139	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	145	$rem += $_ - $i;
137	$_ = $i;	146	$_ = $i;
138	}	147	}
139	}	148	}
140		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
141	# call when resolution changes etc.	166	# call when resolution changes etc.
142	sub rescale_widgets {	167	sub rescale_widgets {
143	my ($sx, $sy) = @_;	168	my ($sx, $sy) = @_;
144		169
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	170	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	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
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
158	}	185	}
159
160	$widget->reconfigure;
161	}	186	}
		187
		188	reconfigure_widgets;
162	}	189	}
163		190
164	#############################################################################	191	#############################################################################
165		192
166	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
171		198
172	sub new {	199	sub new {
173	my $class = shift;	200	my $class = shift;
174		201
175	my $self = bless {	202	my $self = bless {
176	x => 0,	203	x => "center",
177	y => 0,	204	y => "center",
178	z => 0,	205	z => 0,
		206	w => undef,
		207	h => undef,
179	can_events => 1,	208	can_events => 1,
180	@_	209	@_
181	}, $class;	210	}, $class;
182		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
183	for (keys %$self) {	224	for (keys %$self) {
184	if (/^connect_(.*)$/) {	225	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	226	$self->connect ($1 => delete $self->{$_});
186	}	227	}
187	}	228	}
188		229
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
191	$self	230	$self
192	}	231	}
193		232
194	sub destroy {	233	sub destroy {
195	my ($self) = @_;	234	my ($self) = @_;
…		…
204	return if $self->{parent};	243	return if $self->{parent};
205		244
206	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
207	}	246	}
208		247
209	sub hide {	248	sub set_visible {
210	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};
211		272
212	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
214		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
215	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
216	if $self->{parent};	307	if $self->{parent};
217	}	308	}
218		309
219	sub move {	310	sub move_abs {
220	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
221		312
222	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
223	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
224	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
225		316
226	$self->update;	317	$self->update;
227	}	318	}
228		319
229	sub set_size {	320	sub set_size {
230	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
231		322
232	$self->{user_w} = $w;	323	$self->{force_w} = $w;
233	$self->{user_h} = $h;	324	$self->{force_h} = $h;
234		325
235	$self->check_size;	326	$self->realloc;
236	}	327	}
237		328
238	sub size_request {	329	sub size_request {
239	require Carp;	330	require Carp;
240	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
242		333
243	sub configure {	334	sub configure {
244	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
245		336
246	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
247	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
248	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
249		342
250	# use alignment to adjust x, y	343	# use alignment to adjust x, y
251		344
252	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
253	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
254
255	($w, $h) = ($w2, $h2);
256	}	347	}
257		348
258	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
259	$self->{x} = $x;	350	$self->{x} = $x;
260	$self->{y} = $y;	351	$self->{y} = $y;
261	$self->update;	352	$self->update;
262	}	353	}
263		354
264	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
		356	return unless $self->{visible};
		357
265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
266	}	359	}
267	}	360	}
268		361
269	sub size_allocate {	362	sub size_allocate {
270	# nothing to be done	363	# nothing to be done
271	}	364	}
272		365
273	sub reconfigure {
274	my ($self) = @_;
275
276	$self->check_size (1);
277	$self->update;
278	}
279
280	sub children {	366	sub children {
281	}	367	}
282		368
283	sub set_max_size {	369	sub set_max_size {
284	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
…		…
287	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
288	}	374	}
289		375
290	sub set_tooltip {	376	sub set_tooltip {
291	my ($self, $tooltip) = @_;	377	my ($self, $tooltip) = @_;
		378
		379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
292		383
293	$self->{tooltip} = $tooltip;	384	$self->{tooltip} = $tooltip;
294		385
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	387	delete $CFClient::UI::TOOLTIP->{owner};
…		…
318	return if $FOCUS == $self;	409	return if $FOCUS == $self;
319	return unless $self->{can_focus};	410	return unless $self->{can_focus};
320		411
321	my $focus = $FOCUS; $FOCUS = $self;	412	my $focus = $FOCUS; $FOCUS = $self;
322		413
323	$self->emit (focus_in => $focus);	414	$self->_emit (focus_in => $focus);
324		415
325	$focus->update if $focus;	416	$focus->update if $focus;
326	$FOCUS->update;	417	$FOCUS->update;
327	}	418	}
328		419
…		…
331		422
332	return unless $FOCUS == $self;	423	return unless $FOCUS == $self;
333		424
334	my $focus = $FOCUS; undef $FOCUS;	425	my $focus = $FOCUS; undef $FOCUS;
335		426
336	$self->emit (focus_out => $focus);	427	$self->_emit (focus_out => $focus);
337		428
338	$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;
339	}	433	}
340		434
341	sub mouse_motion { }	435	sub mouse_motion { }
342	sub button_up { }	436	sub button_up { }
343	sub key_down { }	437	sub key_down { }
344	sub key_up { }	438	sub key_up { }
345		439
346	sub button_down {	440	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	441	my ($self, $ev, $x, $y) = @_;
348		442
349	$self->focus_in;	443	$self->focus_in;
…		…
352	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356	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	}
357		521
358	sub draw {	522	sub draw {
359	my ($self) = @_;	523	my ($self) = @_;
360		524
361	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
378	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
379	glEnd;	543	glEnd;
380	glDisable GL_BLEND;	544	glDisable GL_BLEND;
381	}	545	}
382		546
383	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
384	glPushMatrix;	548	glPushMatrix;
385	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	552	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
392	glEnd;	556	glEnd;
393	glPopMatrix;	557	glPopMatrix;
394	#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;
395	}	559	}
396	}	560	}
397		561
398	sub _draw {	562	sub _draw {
399	my ($self) = @_;	563	my ($self) = @_;
400		564
401	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
402	}
403
404	sub find_widget {
405	my ($self, $x, $y) = @_;
406
407	return () unless $self->{can_events};
408
409	return $self
410	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413	()
414	}
415
416	sub set_parent {
417	my ($self, $parent) = @_;
418
419	Scalar::Util::weaken ($self->{parent} = $parent);
420
421	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size
423	unless exists $self->{req_w};
424	}
425
426	sub check_size {
427	my ($self, $forced) = @_;
428
429	$self->{force_alloc} = 1 if $forced;
430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
431	}
432
433	sub update {
434	my ($self) = @_;
435
436	$self->{parent}->update
437	if $self->{parent};
438	}
439
440	sub connect {
441	my ($self, $signal, $cb) = @_;
442
443	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}
445
446	sub emit {
447	my ($self, $signal, @args) = @_;
448
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450	}	566	}
451		567
452	sub DESTROY {	568	sub DESTROY {
453	my ($self) = @_;	569	my ($self) = @_;
454		570
…		…
512	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
513	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
514	}	630	}
515		631
516	sub size_request {	632	sub size_request {
517	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
518	}	636	}
519		637
520	sub draw { }	638	sub draw { }
521		639
522	#############################################################################	640	#############################################################################
…		…
551	$self->{children} = [	669	$self->{children} = [
552	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
553	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
554	];	672	];
555		673
556	$self->check_size (1);	674	$self->realloc;
557	$self->update;
558	}	675	}
559		676
560	sub children {	677	sub children {
561	@{ $_[0]{children} }	678	@{ $_[0]{children} }
562	}	679	}
…		…
567	delete $child->{parent};	684	delete $child->{parent};
568	$child->hide;	685	$child->hide;
569		686
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		688
572	$self->check_size;	689	$self->realloc;
573	$self->update;
574	}	690	}
575		691
576	sub clear {	692	sub clear {
577	my ($self) = @_;	693	my ($self) = @_;
578		694
…		…
582	for (@$children) {	698	for (@$children) {
583	delete $_->{parent};	699	delete $_->{parent};
584	$_->hide;	700	$_->hide;
585	}	701	}
586		702
587	$self->check_size;	703	$self->realloc;
588	$self->update;
589	}	704	}
590		705
591	sub find_widget {	706	sub find_widget {
592	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
593		708
…		…
646	sub size_request {	761	sub size_request {
647	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
648	}	763	}
649		764
650	sub size_allocate {	765	sub size_allocate {
651	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
652		767
653	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
654	}	769	}
655		770
656	#############################################################################	771	#############################################################################
…		…
673	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
674	$self->SUPER::update;	789	$self->SUPER::update;
675	}	790	}
676		791
677	sub size_allocate {	792	sub size_allocate {
678	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
679		794
680	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
681	$self->update;	796	$self->update
		797	if $changed;
682	}	798	}
683		799
684	sub _render {	800	sub _render {
685	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
686	}	802	}
…		…
691	$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 {
692	glClearColor 0, 0, 0, 0;	808	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	809	glClear GL_COLOR_BUFFER_BIT;
694		810
695	$self->_render;	811	$self->_render;
696	# glColorMask 1, 1, 1, 0;
697	# glEnable GL_BLEND;
698	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699	# glRasterPos 0, 0;
700	# glCopyPixels 0, 0, $self->{w}, $self->{h};
701	# glDisable GL_BLEND;
702	# glColorMask 1, 1, 1, 1;
703	};	812	};
704	}	813	}
705		814
706	sub _draw {	815	sub _draw {
707	my ($self) = @_;	816	my ($self) = @_;
…		…
711	my $tex = $self->{texture}	820	my $tex = $self->{texture}
712	or return;	821	or return;
713		822
714	glEnable GL_TEXTURE_2D;	823	glEnable GL_TEXTURE_2D;
715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	824	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716	glColor 0, 0, 0, 1;	825	glColor 1, 1, 1, 1;
717		826
718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	827	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719		828
720	glDisable GL_TEXTURE_2D;	829	glDisable GL_TEXTURE_2D;
721	}	830	}
…		…
724		833
725	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
726		835
727	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
728		837
		838	sub new {
		839	my $class = shift;
		840
		841	$class->SUPER::new (
		842	scroll_x => 0,
		843	scroll_y => 1,
		844	@_,
		845	)
		846	}
		847
729	sub size_request {	848	sub size_request {
730	my ($self) = @_;	849	my ($self) = @_;
731		850
732	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
733	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
734		852
735	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
736	}	857	}
737		858
738	sub size_allocate {	859	sub size_allocate {
739	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
740		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);
741	$self->update;	866	$self->update;
742	}	867	}
743		868
744	sub set_offset {	869	sub set_offset {
745	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
796	my $class = shift;	921	my $class = shift;
797		922
798	my $self;	923	my $self;
799		924
800	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
801	vertical => 1,	926	vertical => 1,
802	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
803	connect_changed => sub {	928	on_changed => sub {
804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	929	$self->{vp}->set_offset (0, $_[1]);
805	},	930	},
806	;	931	;
807		932
808	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
809	vp => (new CFClient::UI::ViewPort),	934	vp => (new CFClient::UI::ViewPort expand => 1),
810	slider => $slider,	935	slider => $slider,
811	@_,	936	@_,
812	);	937	);
813		938
814	$self->{vp}->add ($self->{scrolled});	939	$self->{vp}->add ($self->{scrolled});
815	$self->add ($self->{vp});	940	$self->add ($self->{vp});
816	$self->add ($self->{slider});	941	$self->add ($self->{slider});
817		942
818	$self	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]);
819	}	963	}
820		964
821	#TODO# update range on size_allocate depending on child	965	#TODO# update range on size_allocate depending on child
822	# update viewport offset on scroll	966	# update viewport offset on scroll
823		967
…		…
867		1011
868	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
869		1013
870	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
871		1015
872	my @tex =	1016	my $bg =
		1017	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1018	mipmap => 1, wrap => 1;
		1019
		1020	my @border =
873	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875		1023
876	sub new {	1024	sub new {
877	my $class = shift;	1025	my $class = shift;
878		1026
879	# TODO: user_x, user_y, overwrite moveto?
880
881	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
882	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
883	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
884	border => 0.6,	1030	border => 0.6,
885	toplevel => 1,	1031	is_toplevel => 1,
886	can_events => 1,	1032	can_events => 1,
887	@_	1033	@_
888	);	1034	);
889		1035
890	$self->{title} &&= new CFClient::UI::Label	1036	$self->{title} &&= new CFClient::UI::Label
891	align => 0,	1037	align => 0,
…		…
910	$h + $self->border * 2,	1056	$h + $self->border * 2,
911	)	1057	)
912	}	1058	}
913		1059
914	sub size_allocate {	1060	sub size_allocate {
915	my ($self, $w, $h) = @_;	1061	my ($self, $w, $h, $changed) = @_;
		1062
		1063	return unless $changed;
916		1064
917	$h -= List::Util::max 0, $self->border * 2;	1065	$h -= List::Util::max 0, $self->border * 2;
918	$w -= List::Util::max 0, $self->border * 2;	1066	$w -= List::Util::max 0, $self->border * 2;
919		1067
920	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
944	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
945		1093
946	my $dx = $ev->{x} - $ox;	1094	my $dx = $ev->{x} - $ox;
947	my $dy = $ev->{y} - $oy;	1095	my $dy = $ev->{y} - $oy;
948		1096
949	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1099
		1100	$self->realloc;
951	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952	$self->check_size;
953	};	1102	};
954		1103
955	} elsif ($lr ^ $td) {	1104	} elsif ($lr ^ $td) {
956	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});
957	my ($bx, $by) = ($self->{x}, $self->{y});	1106	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
959	$self->{motion} = sub {	1108	$self->{motion} = sub {
960	my ($ev, $x, $y) = @_;	1109	my ($ev, $x, $y) = @_;
961		1110
962	($x, $y) = ($ev->{x}, $ev->{y});	1111	($x, $y) = ($ev->{x}, $ev->{y});
963		1112
964	$self->move ($bx + $x - $ox, $by + $y - $oy);	1113	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965	$self->update;
966	};	1114	};
967	}	1115	}
968	}	1116	}
969		1117
970	sub button_up {	1118	sub button_up {
…		…
989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990		1138
991	my $border = $self->border;	1139	my $border = $self->border;
992		1140
993	glColor @{ $self->{border_bg} };	1141	glColor @{ $self->{border_bg} };
994	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1142	$border[0]->draw_quad_alpha (0, 0, $w, $border);
995	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1143	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
996	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1144	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1145	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998		1146
999	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1147	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000	my $bg = $tex[0];	1148	glColor @{ $self->{bg} };
1001		1149
1002	# TODO: repeat texture not scale	1150	# TODO: repeat texture not scale
		1151	# solve this better(?)
1003	my $rep_x = $cw / $bg->{w};	1152	$bg->{s} = $cw / $bg->{w};
1004	my $rep_y = $ch / $bg->{h};	1153	$bg->{t} = $ch / $bg->{h};
1005
1006	glColor @{ $self->{bg} };
1007
1008	$bg->{s} = $rep_x;
1009	$bg->{t} = $rep_y;
1010	$bg->{wrap_mode} = 1;
1011	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012	}	1155	}
1013		1156
1014	glDisable GL_TEXTURE_2D;	1157	glDisable GL_TEXTURE_2D;
1015		1158
…		…
1031	sub new {	1174	sub new {
1032	my $class = shift;	1175	my $class = shift;
1033		1176
1034	$class->SUPER::new (	1177	$class->SUPER::new (
1035	col_expand => [],	1178	col_expand => [],
1036	@_	1179	@_,
1037	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038	}	1185	}
1039		1186
1040	sub add {	1187	sub add {
1041	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1042		1189
1043	$child->set_parent ($self);	1190	$child->set_parent ($self);
1044	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1045		1192
1046	$child->check_size;	1193	$self->realloc;
1047	}	1194	}
1048		1195
1049	sub children {
1050	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051	}
1052
1053	# 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?
1054	sub clear {	1197	sub clear {
1055	my ($self) = @_;	1198	my ($self) = @_;
1056		1199
1057	my @children = $self->children;	1200	my @children = $self->children;
1058	delete $self->{children};	1201	delete $self->{children};
…		…
1060	for (@children) {	1203	for (@children) {
1061	delete $_->{parent};	1204	delete $_->{parent};
1062	$_->hide;	1205	$_->hide;
1063	}	1206	}
1064		1207
1065	$self->update;	1208	$self->realloc;
1066	}	1209	}
1067		1210
1068	sub get_wh {	1211	sub get_wh {
1069	my ($self) = @_;	1212	my ($self) = @_;
1070		1213
…		…
1097	(sum @$hs),	1240	(sum @$hs),
1098	)	1241	)
1099	}	1242	}
1100		1243
1101	sub size_allocate {	1244	sub size_allocate {
1102	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1103		1246
1104	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1105		1248
1106	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1107	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1108		1251
1109	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1110	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1111	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1112	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1166	}	1309	}
1167	}	1310	}
1168		1311
1169	#############################################################################	1312	#############################################################################
1170		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
1171	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1172		1375
1173	# TODO: wrap into common Box base class
1174
1175	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1176		1377
1177	sub size_request {	1378	sub new {
1178	my ($self) = @_;	1379	my $class = shift;
1179		1380
1180	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1181		1382	vertical => 0,
1182	(	1383	@_,
1183	(List::Util::sum map $_->[0], @alloc),
1184	(List::Util::max map $_->[1], @alloc),
1185	)	1384	)
1186	}	1385	}
1187		1386
1188	sub size_allocate {
1189	my ($self, $w, $h) = @_;
1190
1191	($h, $w) = ($w, $h);
1192
1193	my $children = $self->{children};
1194
1195	my @h = map $_->{req_w}, @$children;
1196
1197	my $req_h = List::Util::sum @h;
1198
1199	if ($req_h > $h) {
1200	# ah well, not enough space
1201	$_ *= $h / $req_h for @h;
1202	} else {
1203	my $exp = List::Util::sum map $_->{expand}, @$children;
1204	$exp ||= 1;
1205
1206	for (0 .. $#$children) {
1207	my $child = $children->[$_];
1208
1209	my $alloc_h = $h[$_];
1210	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211	$h[$_] = $alloc_h;
1212	}
1213	}
1214
1215	CFClient::UI::harmonize \@h;
1216
1217	my $y = 0;
1218	for (0 .. $#$children) {
1219	my $child = $children->[$_];
1220	my $h = $h[$_];
1221	$child->configure ($y, 0, $h, $w);
1222
1223	$y += $h;
1224	}
1225
1226	1
1227	}
1228
1229	#############################################################################	1387	#############################################################################
1230		1388
1231	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1232		1390
1233	# TODO: wrap into common Box base class
1234
1235	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1236		1392
1237	sub size_request {	1393	sub new {
1238	my ($self) = @_;	1394	my $class = shift;
1239		1395
1240	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1241		1397	vertical => 1,
1242	(	1398	@_,
1243	(List::Util::max map $_->[0], @alloc),
1244	(List::Util::sum map $_->[1], @alloc),
1245	)	1399	)
1246	}
1247
1248	sub size_allocate {
1249	my ($self, $w, $h) = @_;
1250
1251	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253	my $children = $self->{children};
1254
1255	my @h = map $_->{req_h}, @$children;
1256
1257	my $req_h = List::Util::sum @h;
1258
1259	if ($req_h > $h) {
1260	# ah well, not enough space
1261	$_ *= $h / $req_h for @h;
1262	} else {
1263	my $exp = List::Util::sum map $_->{expand}, @$children;
1264	$exp ||= 1;
1265
1266	for (0 .. $#$children) {
1267	my $child = $children->[$_];
1268
1269	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270	}
1271	}
1272
1273	CFClient::UI::harmonize \@h;
1274
1275	my $y = 0;
1276	for (0 .. $#$children) {
1277	my $child = $children->[$_];
1278	my $h = $h[$_];
1279	$child->configure (0, $y, $w, $h);
1280
1281	$y += $h;
1282	}
1283
1284	1
1285	}	1400	}
1286		1401
1287	#############################################################################	1402	#############################################################################
1288		1403
1289	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1352	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1353		1468
1354	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1356		1471
		1472	$self->realloc;
1357	$self->update;	1473	$self->update;
1358	$self->check_size;
1359	}	1474	}
1360		1475
1361	sub set_markup {	1476	sub set_markup {
1362	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1363		1478
…		…
1367	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368		1483
1369	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1371		1486
		1487	$self->realloc;
1372	$self->update;	1488	$self->update;
1373	$self->check_size;
1374	}	1489	}
1375		1490
1376	sub size_request {	1491	sub size_request {
1377	my ($self) = @_;	1492	my ($self) = @_;
1378		1493
…		…
1399	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1400	)	1515	)
1401	}	1516	}
1402		1517
1403	sub size_allocate {	1518	sub size_allocate {
1404	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1405		1520
1406	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1407	}	1523	}
1408		1524
1409	sub set_fontsize {	1525	sub set_fontsize {
1410	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1411		1527
1412	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1413	delete $self->{texture};	1529	delete $self->{texture};
1414		1530
1415	$self->update;	1531	$self->realloc;
1416	$self->check_size;
1417	}	1532	}
1418		1533
1419	sub _draw {	1534	sub _draw {
1420	my ($self) = @_;	1535	my ($self) = @_;
1421		1536
…		…
1473	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1474	can_hover => 1,	1589	can_hover => 1,
1475	can_focus => 1,	1590	can_focus => 1,
1476	valign => 0,	1591	valign => 0,
1477	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1478	@_	1594	@_
1479	)	1595	)
1480	}	1596	}
1481		1597
1482	sub _set_text {	1598	sub _set_text {
…		…
1492	$self->{text} = $text;	1608	$self->{text} = $text;
1493		1609
1494	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1495	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1496		1612
1497	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1498	}	1614	}
1499		1615
1500	sub set_text {	1616	sub set_text {
1501	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1502		1618
1503	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1504	$self->_set_text ($text);	1620	$self->_set_text ($text);
1505	$self->update;	1621
1506	$self->check_size;	1622	$self->realloc;
1507	}	1623	}
1508		1624
1509	sub get_text {	1625	sub get_text {
1510	$_[0]{text}	1626	$_[0]{text}
1511	}	1627	}
…		…
1514	my ($self) = @_;	1630	my ($self) = @_;
1515		1631
1516	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1517		1633
1518	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1519	}
1520
1521	sub size_allocate {
1522	my ($self, $w, $h) = @_;
1523
1524	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525	}	1635	}
1526		1636
1527	sub key_down {	1637	sub key_down {
1528	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1529		1639
…		…
1544	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1545	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1546	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1547	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1548	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1549	$self->emit ('escape');	1659	$self->_emit ('escape');
1550	} elsif ($uni) {	1660	} elsif ($uni) {
1551	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1552	}	1662	}
1553		1663
1554	$self->_set_text ($text);	1664	$self->_set_text ($text);
1555	$self->update;	1665
1556	$self->check_size;	1666	$self->realloc;
1557	}	1667	}
1558		1668
1559	sub focus_in {	1669	sub focus_in {
1560	my ($self) = @_;	1670	my ($self) = @_;
1561		1671
…		…
1641	if ($sym == 13) {	1751	if ($sym == 13) {
1642	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1643	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1644	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1645	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1646	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1647	$self->update;	1757	$self->update;
1648		1758
1649	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1650	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1651	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1699	can_events => 1,	1809	can_events => 1,
1700	@_	1810	@_
1701	)	1811	)
1702	}	1812	}
1703		1813
		1814	sub activate { }
		1815
1704	sub button_up {	1816	sub button_up {
1705	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1706		1818
		1819	$self->emit ("activate")
1707	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1708	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1709	$self->emit ("activate");
1710	}
1711	}	1822	}
1712		1823
1713	sub _draw {	1824	sub _draw {
1714	my ($self) = @_;	1825	my ($self) = @_;
1715		1826
…		…
1767	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1768		1879
1769	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1772	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1773	}	1884	}
1774	}	1885	}
1775		1886
1776	sub _draw {	1887	sub _draw {
1777	my ($self) = @_;	1888	my ($self) = @_;
…		…
2052	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2053	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2054	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2055	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2056	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2057	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2058	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2059	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2060	vertical => 0,	2171	vertical => 0,
2061	can_hover => 1,	2172	can_hover => 1,
2062	inner_pad => .05,	2173	inner_pad => 0.02,
2063	@_	2174	@_
2064	);	2175	);
2065		2176
2066	$self->set_value ($self->{range}[0]);	2177	$self->set_value ($self->{range}[0]);
2067	$self->update;	2178	$self->update;
2068		2179
2069	$self	2180	$self
2070	}	2181	}
2071		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
2072	sub set_value {	2194	sub set_value {
2073	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2074		2196
2075	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2197	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076		2198
2077	$hi = $lo + 1 if $hi <= $lo;	2199	$hi = $lo + 1 if $hi <= $lo;
2078		2200
		2201	$page = $hi - $lo if $page > $hi - $lo;
		2202
2079	$value = $lo if $value < $lo;	2203	$value = $lo if $value < $lo;
2080	$value = $hi if $value > $hi;	2204	$value = $hi - $page if $value > $hi - $page;
2081		2205
2082	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2206	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083	if $unit;	2207	if $unit;
2084		2208
2085	$page = $hi - $lo if $page > $hi - $lo;
2086
2087	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2209	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088		2210
2089	if ($value != $old_value) {	2211	if ($value != $old_value) {
2090	$self->emit (changed => $value);	2212	$self->_emit (changed => $value);
2091	$self->update;	2213	$self->update;
2092	}	2214	}
2093	}	2215	}
2094		2216
2095	sub size_request {	2217	sub size_request {
…		…
2103		2225
2104	sub button_down {	2226	sub button_down {
2105	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2106		2228
2107	$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
2108	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2109	}	2234	}
2110		2235
2111	sub mouse_motion {	2236	sub mouse_motion {
2112	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
…		…
2114	if ($GRAB == $self) {	2239	if ($GRAB == $self) {
2115	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116		2241
2117	my (undef, $lo, $hi, $page) = @{$self->{range}};	2242	my (undef, $lo, $hi, $page) = @{$self->{range}};
2118		2243
2119	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120		2245
2121	$self->set_value ($x * ($hi - $lo) + $lo);	2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122	}	2247	}
2123	}	2248	}
2124		2249
2125	sub update {	2250	sub update {
2126	my ($self) = @_;	2251	my ($self) = @_;
2127		2252
2128	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129	$self->set_value ($self->{range}[0]);	2254	$self->set_value ($self->{range}[0]);
2130		2255
2131	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2132		2258
2133	my $inner_w = 1 - 2 * $self->{inner_pad};	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134		2260
2135	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2261	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2262	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136		2263
2137	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2264	$value = ($value - $lo) / $range;
2138	$value = $self->{scale} * ($value - $lo);	2265	$value = $value * $self->{scale} + $self->{offset};
2139		2266
2140	$value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142	$value = 0 if $value < 0;
2143	$page = 1 - $value if $value + $page > 1;
2144
2145	$self->{knob_x} = $value;	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2146	$self->{knob_w} = $page;	2268	$self->{knob_w} = $knob_w;
2147	});	2269	});
2148		2270
2149	$self->SUPER::update;	2271	$self->SUPER::update;
2150	}	2272	}
2151		2273
…		…
2157	glScale $self->{w}, $self->{h};	2279	glScale $self->{w}, $self->{h};
2158		2280
2159	if ($self->{vertical}) {	2281	if ($self->{vertical}) {
2160	# draw a vertical slider like a rotated horizontal slider	2282	# draw a vertical slider like a rotated horizontal slider
2161		2283
		2284	glTranslate 1, 0, 0;
2162	glRotate 90, 0, 0, 1;	2285	glRotate 90, 0, 0, 1;
2163	glTranslate 0, 1, 0;
2164	}	2286	}
2165		2287
2166	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2288	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2289	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168		2290
…		…
2175	# draw handle	2297	# draw handle
2176	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2298	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177		2299
2178	glDisable GL_TEXTURE_2D;	2300	glDisable GL_TEXTURE_2D;
2179	}	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 (@_) }
2180		2343
2181	#############################################################################	2344	#############################################################################
2182		2345
2183	package CFClient::UI::TextView;	2346	package CFClient::UI::TextView;
2184		2347
…		…
2214		2377
2215	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2216	$self->reflow;	2379	$self->reflow;
2217	}	2380	}
2218		2381
2219	sub text_height {
2220	my ($self, $text) = @_;
2221
2222	my $layout = $self->{layout};
2223
2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225	$layout->set_width ($self->{children}[0]{w});
2226	$layout->set_markup ($text);
2227
2228	($layout->size)[1]
2229	}
2230
2231	sub reflow {
2232	my ($self) = @_;
2233
2234	$self->{need_reflow}++;
2235	$self->update;
2236	}
2237
2238	sub size_allocate {	2382	sub size_allocate {
2239	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2240		2384
2241	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2242		2388
2243	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2244	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2245	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2246		2392
2247	$self->reflow;	2393	$self->reflow;
2248	}	2394	}
2249		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
2250	sub add_paragraph {	2430	sub add_paragraph {
2251	my ($self, $color, $text) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2252		2432
2253	#TODO: intelligently "reformat" paragraph	2433	for my $line (split /\n/, $text) {
2254		2434	my ($w, $h) = $self->text_size ($line);
2255	my $height = $self->text_height ($text);
2256
2257	$self->{height} += $height;	2435	$self->{height} += $h;
		2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2437	}
2258		2438
2259	push @{$self->{par}}, [$height, $color, $text];
2260
2261	$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]);
2262	$self->{children}[1]->update;
2263	}	2440	}
2264		2441
2265	sub update {	2442	sub update {
2266	my ($self) = @_;	2443	my ($self) = @_;
2267		2444
…		…
2270	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2271		2448
2272	delete $self->{texture};	2449	delete $self->{texture};
2273		2450
2274	$ROOT->on_post_alloc ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2275	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2455	my $height = 0;
2277		2456
2278	$height += $_->[0] = $self->text_height ($_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2279	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	}
2280		2472
2281	$self->{height} = $height;	2473	$self->{height} = $height;
2282		2474
2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284		2476
2285	delete $self->{texture};	2477	delete $self->{texture};
2286	}	2478	}
2287		2479
2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289	glClearColor 0, 0, 0, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2291		2483
2292	glEnable GL_TEXTURE_2D;
2293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295	my $top = int $self->{children}[1]{range}[0];	2484	my $top = int $self->{children}[1]{range}[0];
2296		2485
2297	my $y0 = $top;	2486	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2487	my $y1 = $top + $H;
2299		2488
2300	my $y = 0;	2489	my $y = 0;
2301		2490
2302	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2303		2492
2304	$layout->set_font ($self->{font}) if $self->{font};	2493	$layout->set_font ($self->{font}) if $self->{font};
2305		2494
		2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
		2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2498
2306	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2307	my $h = $par->[0];	2500	my $h = $par->[1];
2308		2501
2309	if ($y0 < $y + $h && $y < $y1) {	2502	if ($y0 < $y + $h && $y < $y1) {
2310	$layout->set_foreground (@{ $par->[1] });	2503	$layout->set_foreground (@{ $par->[2] });
		2504	$layout->set_width ($W - $par->[3]);
2311	$layout->set_markup ($par->[2]);	2505	$layout->set_markup ($par->[4]);
2312		2506
2313	my ($W, $H) = $layout->size;	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2508
		2509	glRasterPos $par->[3], $y - $y0;
		2510	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315	}	2511	}
2316		2512
2317	$y += $h;	2513	$y += $h;
2318	}	2514	}
2319		2515
2320	glDisable GL_TEXTURE_2D;	2516	glDisable GL_BLEND;
2321	};	2517	};
2322	});	2518	});
2323	}	2519	}
2324		2520
2325	sub _draw {	2521	sub _draw {
2326	my ($self) = @_;	2522	my ($self) = @_;
2327		2523
2328	glEnable GL_TEXTURE_2D;	2524	glEnable GL_TEXTURE_2D;
2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330	glColor 1, 1, 1, 1;	2526	glColor 1, 1, 1, 1;
2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2527	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332	glDisable GL_TEXTURE_2D;	2528	glDisable GL_TEXTURE_2D;
2333		2529
2334	$self->{children}[1]->draw;	2530	$self->{children}[1]->draw;
2335		2531
2336	}	2532	}
…		…
2385		2581
2386	sub new {	2582	sub new {
2387	my $class = shift;	2583	my $class = shift;
2388		2584
2389	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2390	state => 0,	2586	state => 0,
2391	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2392	@_	2588	@_
2393	);	2589	);
2394		2590
2395	if ($self->{state}) {
2396	$self->{state} = 0;
2397	$self->toggle_flopper;
2398	}
2399
2400	$self	2591	$self
2401	}	2592	}
2402		2593
2403	sub toggle_flopper {	2594	sub toggle_flopper {
2404	my ($self) = @_;	2595	my ($self) = @_;
2405		2596
2406	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2407	if ($self->{state} = !$self->{state}) {
2408	$CFClient::UI::ROOT->add ($self->{other});
2409	$self->{other}->move ($self->coord2global (0, $self->{h}));
2410	$self->emit ("open");
2411	} else {
2412	$CFClient::UI::ROOT->remove ($self->{other});
2413	$self->emit ("close");
2414	}
2415
2416	$self->emit (changed => $self->{state});
2417	}	2598	}
2418		2599
2419	#############################################################################	2600	#############################################################################
2420		2601
2421	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2453		2634
2454	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2455	}	2636	}
2456		2637
2457	sub size_allocate {	2638	sub size_allocate {
2458	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2459		2640
		2641	return unless $changed;
		2642
2460	$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	});
2461	}	2662	}
2462		2663
2463	sub _draw {	2664	sub _draw {
2464	my ($self) = @_;	2665	my ($self) = @_;
2465		2666
…		…
2482	glVertex $w, $h;	2683	glVertex $w, $h;
2483	glVertex $w, 0;	2684	glVertex $w, 0;
2484	glEnd;	2685	glEnd;
2485		2686
2486	glTranslate 2 - 0.375, 2 - 0.375;	2687	glTranslate 2 - 0.375, 2 - 0.375;
		2688
2487	$self->SUPER::_draw;	2689	$self->SUPER::_draw;
2488	}	2690	}
2489		2691
2490	#############################################################################	2692	#############################################################################
2491		2693
…		…
2496	use CFClient::OpenGL;	2698	use CFClient::OpenGL;
2497		2699
2498	sub new {	2700	sub new {
2499	my $class = shift;	2701	my $class = shift;
2500		2702
2501	$class->SUPER::new (	2703	my $self = $class->SUPER::new (
2502	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2503	@_,	2706	@_,
2504	)	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
2505	}	2724	}
2506		2725
2507	sub size_request {	2726	sub size_request {
2508	(32, 8)	2727	(32, 8)
2509	}	2728	}
2510		2729
		2730	sub update {
		2731	my ($self) = @_;
		2732
		2733	return unless $self->{visible};
		2734
		2735	$self->SUPER::update;
		2736	}
		2737
2511	sub _draw {	2738	sub _draw {
2512	my ($self) = @_;	2739	my ($self) = @_;
2513		2740
2514	return unless $::CONN;#d# manage and cache textures differently	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
2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516		2753
2517	# TODO animation
2518	if ($tex) {	2754	if ($tex) {
2519	glEnable GL_TEXTURE_2D;	2755	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2757	glColor 1, 1, 1, 1;
2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2524	}	2760	}
2525	}	2761	}
2526		2762
		2763	sub DESTROY {
		2764	my ($self) = @_;
		2765
		2766	$self->{timer}->cancel
		2767	if $self->{timer};
		2768
		2769	$self->SUPER::DESTROY;
		2770	}
		2771
2527	#############################################################################	2772	#############################################################################
2528		2773
2529	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2530		2775
2531	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533	sub _item_to_desc {
2534	my ($item) = @_;
2535
2536	my $desc =
2537	$item->{nrof} < 2
2538	? $item->{name}
2539	: "$item->{nrof} $item->{name_pl}";
2540
2541	$item->{flags} & Crossfire::Protocol::F_OPEN
2542	and $desc .= " (open)";
2543	$item->{flags} & Crossfire::Protocol::F_APPLIED
2544	and $desc .= " (applied)";
2545	$item->{flags} & Crossfire::Protocol::F_UNPAID
2546	and $desc .= " (unpaid)";
2547	$item->{flags} & Crossfire::Protocol::F_MAGIC
2548	and $desc .= " (magic)";
2549	$item->{flags} & Crossfire::Protocol::F_CURSED
2550	and $desc .= " (cursed)";
2551	$item->{flags} & Crossfire::Protocol::F_DAMNED
2552	and $desc .= " (damned)";
2553	$item->{flags} & Crossfire::Protocol::F_LOCKED
2554	and $desc .= " *";
2555
2556	$desc
2557	}
2558		2777
2559	sub new {	2778	sub new {
2560	my $class = shift;	2779	my $class = shift;
2561		2780
2562	my %args = @_;
2563
2564	my $item = delete $args{item};
2565
2566	my $desc = _item_to_desc ($item);
2567
2568	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2569	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2570	can_events => 1,
2571	tooltip => ((CFClient::UI::Label::escape $desc)
2572	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573	connect_button_down => sub {
2574	my ($self, $ev, $x, $y) = @_;
2575
2576	# todo: maybe put examine on 1? but should just be a tooltip :(
2577	if ($ev->{button} == 1) {
2578	my $targ = $::CONN->{player}{tag};
2579
2580	if ($item->{container} == $::CONN->{player}{tag}) {
2581	$targ = $main::OPENCONT;
2582	}
2583
2584	$::CONN->send ("move $targ $item->{tag} 0");
2585	} elsif ($ev->{button} == 2) {
2586	$::CONN->send ("apply $item->{tag}");
2587	} elsif ($ev->{button} == 3) {
2588	my @menu_items = (
2589	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593	[
2594	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595	sub { $::CONN->send ("lock $item->{tag}") },
2596	],
2597	);
2598
2599	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600	}
2601
2602	1
2603	},
2604	%args
2605	);
2606
2607
2608	$self->add (new CFClient::UI::Face
2609	can_events => 0,
2610	face => $item->{face},
2611	anim => $item->{anim},
2612	animspeed => $item->{animspeed},
2613	);
2614
2615	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617	$self->{item} = $item;
2618
2619	$self->update_item;
2620
2621	$self
2622	}
2623
2624	sub update_item {
2625	my ($self) = @_;
2626
2627	my $desc = _item_to_desc ($self->{item});
2628
2629	$self->{name_lbl}->set_text ($desc);
2630	}
2631
2632	#############################################################################
2633
2634	package CFClient::UI::Inventory;
2635
2636	our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638	sub new {
2639	my $class = shift;
2640
2641	my $self = $class->SUPER::new (
2642	scrolled => (new CFClient::UI::VBox),
2643	@_,	2783	@_,
2644	);	2784	);
2645		2785
2646	$self	2786	$self
2647	}	2787	}
…		…
2657	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2658	} @$items;	2798	} @$items;
2659		2799
2660	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2661		2801
		2802	my $row = 0;
2662	for my $item (@items) {	2803	for my $item (@items) {
2663	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2804	CFClient::Item::update_widgets $item;
2664	$item->update_item ();
2665	}
2666		2805
2667	$self->{scrolled}->add (@items);	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});
2668		2809
2669	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2810	$row++;
2670	}	2811	}
2671
2672	sub size_request {
2673	my ($self) = @_;
2674	($self->{req_w}, $self->{req_h});
2675	}	2812	}
2676		2813
2677	#############################################################################	2814	#############################################################################
2678		2815
2679	package CFClient::UI::Menu;	2816	package CFClient::UI::Menu;
…		…
2714		2851
2715	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2716	sub popup {	2853	sub popup {
2717	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2718		2855
2719	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2720		2857
2721	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2722	$GRAB = $self;	2859	$GRAB = $self;
2723	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2724		2861
…		…
2739		2876
2740	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2741	undef $GRAB;	2878	undef $GRAB;
2742	$self->hide;	2879	$self->hide;
2743		2880
2744	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2745	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2746	}	2883	}
2747	}	2884	}
2748		2885
2749	#############################################################################	2886	#############################################################################
…		…
2811	sub add {	2948	sub add {
2812	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2813		2950
2814	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2815	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2816		2955
2817	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2818		2957
2819	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820		2959
…		…
2863	use CFClient::OpenGL;	3002	use CFClient::OpenGL;
2864		3003
2865	sub new {	3004	sub new {
2866	my $class = shift;	3005	my $class = shift;
2867		3006
2868	$class->SUPER::new (	3007	my $self = $class->SUPER::new (
		3008	visible => 1,
2869	@_,	3009	@_,
2870	)	3010	);
		3011
		3012	Scalar::Util::weaken ($self->{root} = $self);
		3013
		3014	$self
2871	}	3015	}
2872		3016
2873	sub configure {	3017	sub configure {
2874	my ($self, $x, $y, $w, $h) = @_;	3018	my ($self, $x, $y, $w, $h) = @_;
2875		3019
2876	$self->{w} = $w;	3020	$self->{w} = $w;
2877	$self->{h} = $h;	3021	$self->{h} = $h;
2878	}	3022	}
2879		3023
2880	sub check_size {	3024	sub reconfigure {
2881	my ($self) = @_;	3025	my ($self) = @_;
2882		3026
		3027	$self->SUPER::reconfigure;
		3028
2883	$self->size_allocate ($self->{w}, $self->{h})	3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
2884	if $self->{w};	3030	if $self->{w};
2885	}	3031	}
2886		3032
2887	sub size_request {	3033	sub size_request {
2888	my ($self) = @_;	3034	my ($self) = @_;
2889		3035
2890	($self->{w}, $self->{h})	3036	($self->{w}, $self->{h})
2891	}	3037	}
2892		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
2893	sub size_allocate {	3053	sub size_allocate {
2894	my ($self, $w, $h) = @_;	3054	my ($self, $w, $h, $changed) = @_;
2895
2896	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901		3055
2902	for my $child ($self->children) {	3056	for my $child ($self->children) {
2903	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)};
2904		3058
2905	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3059	$X = $child->{force_x} if exists $child->{force_x};
2906	if exists $child->{req_x};	3060	$Y = $child->{force_y} if exists $child->{force_y};
2907		3061
2908	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3062	$X = _to_pixel $X, $W, $self->{w};
2909	if exists $child->{req_y};	3063	$Y = _to_pixel $Y, $H, $self->{h};
2910
2911	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913		3064
2914	$child->configure ($X, $Y, $W, $H);	3065	$child->configure ($X, $Y, $W, $H);
2915	}	3066	}
2916	}	3067	}
2917		3068
…		…
2928	}	3079	}
2929		3080
2930	sub update {	3081	sub update {
2931	my ($self) = @_;	3082	my ($self) = @_;
2932		3083
2933	$self->check_size;
2934	$::WANT_REFRESH++;	3084	$::WANT_REFRESH++;
2935	}	3085	}
2936		3086
2937	sub add {	3087	sub add {
2938	my ($self, @children) = @_;	3088	my ($self, @children) = @_;
2939		3089
2940	for my $child (@children) {
2941	$child->{toplevel} = 1;	3090	$_->{is_toplevel} = 1
2942		3091	for @children;
2943	# integerise window positions
2944	$child->{x} = int $child->{x};
2945	$child->{y} = int $child->{y};
2946	}
2947		3092
2948	$self->SUPER::add (@children);	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	}
2949	}	3109	}
2950		3110
2951	sub on_refresh {	3111	sub on_refresh {
2952	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
2953		3113
…		…
2966	while ($self->{refresh_hook}) {	3126	while ($self->{refresh_hook}) {
2967	$_->()	3127	$_->()
2968	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
2969	}	3129	}
2970		3130
2971	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
2972	my @queue = ([], []);	3132	my @queue;
2973		3133
2974	for (;;) {	3134	while () {
2975	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
2976	# heuristic: check containers last	3136	#TODO use array-of-depth approach
2977	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
2978	for values %{delete $self->{check_size}}	3138	@queue = sort { $a->{visible} <=> $b->{visible} }
		3139	@queue, values %{delete $self->{realloc}};
2979	}	3140	}
2980		3141
2981	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
2982		3143
		3144	$widget->{visible} or last; # do not resize invisible widgets
		3145
2983	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
2984	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(force_w force_h)}
2985	: $widget->size_request;	3148	: $widget->size_request;
2986		3149
2987	if (delete $widget->{force_alloc}	3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
2988	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3151
2989	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3152	$w = $min_size if $w < $min_size;
2990		3153	$h = $min_size if $h < $min_size;
		3154
2991	$widget->{req_w} = $w;	3155	$widget->{req_w} = $w;
2992	$widget->{req_h} = $h;	3156	$widget->{req_h} = $h;
2993		3157
2994	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
2995		3159
2996	$widget->{parent}->check_size	3160	push @queue, $widget->{parent}
2997	if $widget->{parent};	3161	if $widget->{parent};
2998	}
2999	}	3162	}
3000	}	3163	}
3001		3164
3002	while ($self->{size_alloc}) {	3165	while (my $size_alloc = delete $self->{size_alloc}) {
3003	for (values %{delete $self->{size_alloc}}) {	3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3004	my ($widget, $w, $h) = @$_;	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;
3005		3174
3006	$w = 0 if $w < 0;	3175	$w = 0 if $w < 0;
3007	$h = 0 if $h < 0;	3176	$h = 0 if $h < 0;
3008		3177
		3178	$w = int $w + 0.5;
		3179	$h = int $h + 0.5;
		3180
		3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3182
3009	$widget->{w} = $w;	3183	$widget->{w} = $w;
3010	$widget->{h} = $h;	3184	$widget->{h} = $h;
3011	$widget->size_allocate ($w, $h);	3185
3012	$widget->emit (size_allocate => $w, $h);	3186	$widget->emit (size_allocate => $w, $h, $changed);
3013	}	3187	}
3014	}	3188	}
3015		3189
3016	while ($self->{post_alloc_hook}) {	3190	while ($self->{post_alloc_hook}) {
3017	$_->()	3191	$_->()
…		…
3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023	glClear GL_COLOR_BUFFER_BIT;	3197	glClear GL_COLOR_BUFFER_BIT;
3024		3198
3025	glMatrixMode GL_PROJECTION;	3199	glMatrixMode GL_PROJECTION;
3026	glLoadIdentity;	3200	glLoadIdentity;
3027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3201	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028	glMatrixMode GL_MODELVIEW;	3202	glMatrixMode GL_MODELVIEW;
3029	glLoadIdentity;	3203	glLoadIdentity;
3030		3204
3031	$self->_draw;	3205	$self->_draw;
3032	}	3206	}

Diff Legend

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