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

Diff Legend

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