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.182 by root, Sun Apr 30 11:17:08 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);
29		52
		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
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}
37
38	$TOOLTIP->move ($x, $y);
39	}	60	}
40		61
41	return;	62	return;
42	}	63	}
43	}	64	}
…		…
47	delete $TOOLTIP->{owner};	68	delete $TOOLTIP->{owner};
48	}	69	}
49		70
50	# class methods for events	71	# class methods for events
51	sub feed_sdl_key_down_event {	72	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	73	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	74	if $FOCUS;
54	}	75	}
55		76
56	sub feed_sdl_key_up_event {	77	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	78	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	79	if $FOCUS;
59	}	80	}
60		81
61	sub feed_sdl_button_down_event {	82	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	83	my ($ev) = @_;
…		…
71	check_tooltip;	92	check_tooltip;
72	}	93	}
73		94
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		96
76	if ($GRAB) {	97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	98	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	99	}
81		100
82	sub feed_sdl_button_up_event {	101	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	102	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	103	my ($x, $y) = ($ev->{x}, $ev->{y});
85		104
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		106
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		108
90	if ($GRAB) {	109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	110	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		111
95	if (!$BUTTON_STATE) {	112	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	113	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	114	$grab->update if $grab;
98	$GRAB->update if $GRAB;	115	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	131	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		132
116	check_tooltip;	133	check_tooltip;
117	}	134	}
118		135
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	137	if $HOVER;
123	}	138	}
124		139
125	# convert position array to integers	140	# convert position array to integers
126	sub harmonize {	141	sub harmonize {
127	my ($vals) = @_;	142	my ($vals) = @_;
…		…
131	for (@$vals) {	146	for (@$vals) {
132	my $i = int $_ + $rem;	147	my $i = int $_ + $rem;
133	$rem += $_ - $i;	148	$rem += $_ - $i;
134	$_ = $i;	149	$_ = $i;
135	}	150	}
		151	}
		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;
136	}	185	}
137		186
138	#############################################################################	187	#############################################################################
139		188
140	package CFClient::UI::Base;	189	package CFClient::UI::Base;
…		…
153	can_events => 1,	202	can_events => 1,
154	@_	203	@_
155	}, $class;	204	}, $class;
156		205
157	for (keys %$self) {	206	for (keys %$self) {
158	if (/^connect_(.*)$/) {	207	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	208	$self->connect ($1 => delete $self->{$_});
160	}	209	}
161	}	210	}
162		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
163	$self	221	$self
164	}	222	}
165		223
166	sub destroy {	224	sub destroy {
167	my ($self) = @_;	225	my ($self) = @_;
…		…
176	return if $self->{parent};	234	return if $self->{parent};
177		235
178	$CFClient::UI::ROOT->add ($self);	236	$CFClient::UI::ROOT->add ($self);
179	}	237	}
180		238
181	sub hide {	239	sub center {
182	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};
183		275
184	undef $GRAB if $GRAB == $self;	276	undef $GRAB if $GRAB == $self;
185	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;
186		308
187	$self->{parent}->remove ($self)	309	$self->{parent}->remove ($self)
188	if $self->{parent};	310	if $self->{parent};
189	}	311	}
190		312
…		…
199	}	321	}
200		322
201	sub set_size {	323	sub set_size {
202	my ($self, $w, $h) = @_;	324	my ($self, $w, $h) = @_;
203		325
204	$self->{user_w} = $w;	326	$self->{def_w} = $w;
205	$self->{user_h} = $h;	327	$self->{def_h} = $h;
206		328
207	$self->check_size;	329	$self->realloc;
208	}	330	}
209		331
210	sub size_request {	332	sub size_request {
211	require Carp;	333	require Carp;
212	Carp::confess "size_request is abstract";	334	Carp::confess "size_request is abstract";
…		…
232	$self->{y} = $y;	354	$self->{y} = $y;
233	$self->update;	355	$self->update;
234	}	356	}
235		357
236	if ($self->{w} != $w || $self->{h} != $h) {	358	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	359	return unless $self->{visible};
238	$self->{h} = $h;
239		360
240	$self->size_allocate ($w, $h);	361	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	362	}
244	}	363	}
245		364
246	sub size_allocate {	365	sub size_allocate {
247	# nothing to be done	366	# nothing to be done
248	}	367	}
249		368
250	sub children {	369	sub children {
251	}	370	}
252		371
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}
262
263	sub set_max_size {	372	sub set_max_size {
264	my ($self, $w, $h) = @_;	373	my ($self, $w, $h) = @_;
265		374
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	375	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	376	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}	377	}
269		378
270	# return top left coordinates	379	sub set_tooltip {
271	sub _topleft {
272	my ($self, $x, $y) = @_;	380	my ($self, $tooltip) = @_;
273		381
274	$self->{parent}	382	$tooltip =~ s/^\s+//;
275	or Carp::confess "no parent widget in _topleft\n";#d#	383	$tooltip =~ s/\s+$//;
276		384
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	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	}
278	}	393	}
279		394
280	# translate global coordinates to local coordinate system	395	# translate global coordinates to local coordinate system
281	sub coord2local {	396	sub coord2local {
282	my ($self, $x, $y) = @_;	397	my ($self, $x, $y) = @_;
283		398
284	my ($X, $Y) = $self->_topleft;	399	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	400	}
287		401
288	# translate local coordinates to global coordinate system	402	# translate local coordinates to global coordinate system
289	sub coord2global {	403	sub coord2global {
290	my ($self, $x, $y) = @_;	404	my ($self, $x, $y) = @_;
291		405
292	my ($X, $Y) = $self->_topleft;	406	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	407	}
295		408
296	sub focus_in {	409	sub focus_in {
297	my ($self) = @_;	410	my ($self) = @_;
298		411
299	return if $FOCUS == $self;	412	return if $FOCUS == $self;
300	return unless $self->{can_focus};	413	return unless $self->{can_focus};
301		414
302	my $focus = $FOCUS; $FOCUS = $self;	415	my $focus = $FOCUS; $FOCUS = $self;
303		416
304	$self->emit (focus_in => $focus);	417	$self->_emit (focus_in => $focus);
305		418
306	$focus->update if $focus;	419	$focus->update if $focus;
307	$FOCUS->update;	420	$FOCUS->update;
308	}	421	}
309		422
…		…
312		425
313	return unless $FOCUS == $self;	426	return unless $FOCUS == $self;
314		427
315	my $focus = $FOCUS; undef $FOCUS;	428	my $focus = $FOCUS; undef $FOCUS;
316		429
317	$self->emit (focus_out => $focus);	430	$self->_emit (focus_out => $focus);
318		431
319	$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;
320	}	436	}
321		437
322	sub mouse_motion { }	438	sub mouse_motion { }
323	sub button_up { }	439	sub button_up { }
324	sub key_down { }	440	sub key_down { }
325	sub key_up { }	441	sub key_up { }
326		442
327	sub button_down {	443	sub button_down {
328	my ($self, $ev, $x, $y) = @_;	444	my ($self, $ev, $x, $y) = @_;
329		445
330	$self->focus_in;	446	$self->focus_in;
…		…
333	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	449	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	450	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	451	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	452	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337	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	}
338		517
339	sub draw {	518	sub draw {
340	my ($self) = @_;	519	my ($self) = @_;
341		520
342	return unless $self->{h} && $self->{w};	521	return unless $self->{h} && $self->{w};
…		…
364	if ($ENV{PCLIENT_DEBUG}) {	543	if ($ENV{PCLIENT_DEBUG}) {
365	glPushMatrix;	544	glPushMatrix;
366	glColor 1, 1, 0, 1;	545	glColor 1, 1, 0, 1;
367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	546	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368	glBegin GL_LINE_LOOP;	547	glBegin GL_LINE_LOOP;
369	glVertex 0 , 0;	548	glVertex 0 , 0;
370	glVertex $self->{w}, 0;	549	glVertex $self->{w} - 1, 0;
371	glVertex $self->{w}, $self->{h};	550	glVertex $self->{w} - 1, $self->{h} - 1;
372	glVertex 0 , $self->{h};	551	glVertex 0 , $self->{h} - 1;
373	glEnd;	552	glEnd;
374	glPopMatrix;	553	glPopMatrix;
375	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;
376	}	555	}
377	}	556	}
378		557
379	sub _draw {	558	sub _draw {
380	my ($self) = @_;	559	my ($self) = @_;
381		560
382	warn "no draw defined for $self\n";	561	warn "no draw defined for $self\n";
383	}	562	}
384		563
385	sub find_widget {
386	my ($self, $x, $y) = @_;
387
388	return () unless $self->{can_events};
389
390	return $self
391	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394	()
395	}
396
397	sub set_parent {
398	my ($self, $parent) = @_;
399
400	Scalar::Util::weaken ($self->{parent} = $parent);
401	}
402
403	sub check_size {
404	my ($self) = @_;
405
406	$self->{parent}
407	or return 1;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}
428
429	sub update {
430	my ($self) = @_;
431
432	$self->{parent}->update
433	if $self->{parent};
434	}
435
436	sub connect {
437	my ($self, $signal, $cb) = @_;
438
439	push @{ $self->{signal_cb}{$signal} }, $cb;
440	}
441
442	sub emit {
443	my ($self, $signal, @args) = @_;
444
445	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446	}
447
448	sub DESTROY {	564	sub DESTROY {
449	my ($self) = @_;	565	my ($self) = @_;
450		566
		567	delete $WIDGET{$self+0};
451	#$self->deactivate;	568	#$self->deactivate;
452	}	569	}
453		570
454	#############################################################################	571	#############################################################################
455		572
…		…
464	my $class = shift;	581	my $class = shift;
465		582
466	# range [value, low, high, page]	583	# range [value, low, high, page]
467		584
468	$class->SUPER::new (	585	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	586	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	587	#active_bg => [1, 1, 1, 0.5],
471	@_	588	@_
472	)	589	)
473	}	590	}
474		591
475	sub _draw {	592	sub _draw {
476	my ($self) = @_;	593	my ($self) = @_;
477		594
		595	my $color = $FOCUS == $self && $self->{active_bg}
		596	? $self->{active_bg}
		597	: $self->{bg};
		598
		599	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	600	my ($w, $h) = @$self{qw(w h)};
479		601
480	glEnable GL_BLEND;	602	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	603	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	604	glColor @$color;
483		605
484	glBegin GL_QUADS;	606	glBegin GL_QUADS;
485	glVertex 0 , 0;	607	glVertex 0 , 0;
486	glVertex 0 , $h;	608	glVertex 0 , $h;
487	glVertex $w, $h;	609	glVertex $w, $h;
488	glVertex $w, 0;	610	glVertex $w, 0;
489	glEnd;	611	glEnd;
490		612
491	glDisable GL_BLEND;	613	glDisable GL_BLEND;
		614	}
492	}	615	}
493		616
494	#############################################################################	617	#############################################################################
495		618
496	package CFClient::UI::Empty;	619	package CFClient::UI::Empty;
…		…
528		651
529	$self	652	$self
530	}	653	}
531		654
532	sub add {	655	sub add {
533	my ($self, $child) = @_;	656	my ($self, @widgets) = @_;
534		657
535	$child->set_parent ($self);	658	$_->set_parent ($self)
		659	for @widgets;
536		660
537	use sort 'stable';	661	use sort 'stable';
538		662
539	$self->{children} = [	663	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	664	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	665	@{$self->{children}}, @widgets
542	];	666	];
543		667
544	$child->check_size;	668	$self->realloc;
545	$self->update;
546	}	669	}
547		670
548	sub children {	671	sub children {
549	@{ $_[0]{children} }	672	@{ $_[0]{children} }
550	}	673	}
…		…
555	delete $child->{parent};	678	delete $child->{parent};
556	$child->hide;	679	$child->hide;
557		680
558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559		682
560	$self->check_size;	683	$self->realloc;
561	$self->update;
562	}	684	}
563		685
564	sub clear {	686	sub clear {
565	my ($self) = @_;	687	my ($self) = @_;
566		688
…		…
570	for (@$children) {	692	for (@$children) {
571	delete $_->{parent};	693	delete $_->{parent};
572	$_->hide;	694	$_->hide;
573	}	695	}
574		696
575	$self->check_size;	697	$self->realloc;
576	$self->update;
577	}	698	}
578		699
579	sub find_widget {	700	sub find_widget {
580	my ($self, $x, $y) = @_;	701	my ($self, $x, $y) = @_;
581		702
…		…
634	sub size_request {	755	sub size_request {
635	$_[0]{children}[0]->size_request	756	$_[0]{children}[0]->size_request
636	}	757	}
637		758
638	sub size_allocate {	759	sub size_allocate {
639	my ($self, $w, $h) = @_;	760	my ($self, $w, $h, $changed) = @_;
640		761
641	$self->{children}[0]->configure (0, 0, $w, $h);	762	$self->{children}[0]->configure (0, 0, $w, $h);
642	}	763	}
643		764
644	#############################################################################	765	#############################################################################
…		…
656	}	777	}
657		778
658	sub update {	779	sub update {
659	my ($self) = @_;	780	my ($self) = @_;
660		781
661	$ROOT->on_refresh ($self => sub { $self->render_child });	782	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	783	$self->SUPER::update;
663	}	784	}
664		785
665	sub size_allocate {	786	sub size_allocate {
666	my ($self, $w, $h) = @_;	787	my ($self, $w, $h, $changed) = @_;
667		788
668	$self->SUPER::size_allocate ($w, $h);	789	$self->SUPER::size_allocate ($w, $h, $changed);
669	$self->update;	790	$self->update
		791	if $changed;
670	}	792	}
671		793
672	sub _render {	794	sub _render {
673	$_[0]{children}[0]->draw;	795	$_[0]{children}[0]->draw;
674	}	796	}
…		…
679	$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 {
680	glClearColor 0, 0, 0, 0;	802	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	803	glClear GL_COLOR_BUFFER_BIT;
682		804
683	$self->_render;	805	$self->_render;
684	# glColorMask 1, 1, 1, 0;
685	# glEnable GL_BLEND;
686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687	# glRasterPos 0, 0;
688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
689	# glDisable GL_BLEND;
690	# glColorMask 1, 1, 1, 1;
691	};	806	};
692	}	807	}
693		808
694	sub _draw {	809	sub _draw {
695	my ($self) = @_;	810	my ($self) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	812	my ($w, $h) = ($self->w, $self->h);
698		813
699	my $tex = $self->{texture}	814	my $tex = $self->{texture}
700	or return;	815	or return;
701		816
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	817	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	818	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	819	glColor 1, 1, 1, 1;
707		820
708	$tex->draw_quad (0, 0, $w, $h);	821	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		822
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	823	glDisable GL_TEXTURE_2D;
712	}	824	}
713		825
714	#############################################################################	826	#############################################################################
715		827
716	package CFClient::UI::ViewPort;	828	package CFClient::UI::ViewPort;
717		829
718	our @ISA = CFClient::UI::Window::;	830	our @ISA = CFClient::UI::Window::;
719		831
		832	sub new {
		833	my $class = shift;
		834
		835	$class->SUPER::new (
		836	scroll_x => 0,
		837	scroll_y => 1,
		838	@_,
		839	)
		840	}
		841
720	sub size_request {	842	sub size_request {
721	my ($self) = @_;	843	my ($self) = @_;
722		844
723	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	845	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
725		846
726	@$self{qw(child_w child_h)}	847	$w = 10 if $self->{scroll_x};
		848	$h = 10 if $self->{scroll_y};
		849
		850	($w, $h)
727	}	851	}
728		852
729	sub size_allocate {	853	sub size_allocate {
730	my ($self, $w, $h) = @_;	854	my ($self, $w, $h, $changed) = @_;
731		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);
732	$self->update;	860	$self->update;
733	}	861	}
734		862
735	sub set_offset {	863	sub set_offset {
736	my ($self, $x, $y) = @_;	864	my ($self, $x, $y) = @_;
…		…
739	$self->{view_y} = int $y;	867	$self->{view_y} = int $y;
740		868
741	$self->update;	869	$self->update;
742	}	870	}
743		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
744	sub _render {	900	sub _render {
745	my ($self) = @_;	901	my ($self) = @_;
746		902
747	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	903	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748		904
…		…
759	my $class = shift;	915	my $class = shift;
760		916
761	my $self;	917	my $self;
762		918
763	my $slider = new CFClient::UI::Slider	919	my $slider = new CFClient::UI::Slider
764	vertical => 1,	920	vertical => 1,
765	range => [0, 0, 1, 0.01], # HACK fix	921	range => [0, 0, 1, 0.01], # HACK fix
766	connect_changed => sub {	922	on_changed => sub {
767	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	923	$self->{vp}->set_offset (0, $_[1]);
768	},	924	},
769	;	925	;
770		926
771	$self = $class->SUPER::new (	927	$self = $class->SUPER::new (
772	vp => (new CFClient::UI::ViewPort),	928	vp => (new CFClient::UI::ViewPort expand => 1),
773	slider => $slider,	929	slider => $slider,
774	@_,	930	@_,
775	);	931	);
776		932
777	$self->{vp}->add ($self->{scrolled});	933	$self->{vp}->add ($self->{scrolled});
…		…
779	$self->add ($self->{slider});	935	$self->add ($self->{slider});
780		936
781	$self	937	$self
782	}	938	}
783		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
784	#TODO# update range on size_allocate depeneing on child	959	#TODO# update range on size_allocate depending on child
785	# update viewport offset on scroll	960	# update viewport offset on scroll
786		961
787	#############################################################################	962	#############################################################################
788		963
789	package CFClient::UI::Frame;	964	package CFClient::UI::Frame;
…		…
793	use CFClient::OpenGL;	968	use CFClient::OpenGL;
794		969
795	sub new {	970	sub new {
796	my $class = shift;	971	my $class = shift;
797		972
798	my $self = $class->SUPER::new (	973	$class->SUPER::new (
799	bg => [1, 1, 1, 1],	974	bg => undef,
800	border_bg => [1, 1, 1, 1],
801	border => 0.8,
802	@_	975	@_,
803	);	976	)
804
805	$self
806	}	977	}
807		978
808	sub _draw {	979	sub _draw {
809	my ($self) = @_;	980	my ($self) = @_;
810		981
811	my ($w, $h) = ($self->{w}, $self->{h});	982	if ($self->{bg}) {
		983	my ($w, $h) = @$self{qw(w h)};
812		984
813	glEnable GL_BLEND;	985	glEnable GL_BLEND;
814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	986	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815	glEnable GL_TEXTURE_2D;	987	glColor @{ $self->{bg} };
816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817		988
818	# glBegin GL_QUADS;	989	glBegin GL_QUADS;
819	# glColor 0, 0, 0, 0;
820	# glVertex 0 , 0;	990	glVertex 0 , 0;
821	# glVertex 0 , $h;	991	glVertex 0 , $h;
822	# glVertex $w, $h;	992	glVertex $w, $h;
823	# glVertex $w, 0;	993	glVertex $w, 0;
824	# glEnd;	994	glEnd;
825		995
826
827	$self->child->draw;
828	glDisable GL_BLEND;	996	glDisable GL_BLEND;
829	glDisable GL_TEXTURE_2D;	997	}
		998
		999	$self->SUPER::_draw;
830	}	1000	}
831		1001
832	#############################################################################	1002	#############################################################################
833		1003
834	package CFClient::UI::FancyFrame;	1004	package CFClient::UI::FancyFrame;
…		…
842	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);
843		1013
844	sub new {	1014	sub new {
845	my $class = shift;	1015	my $class = shift;
846		1016
847	# TODO: user_x, user_y, overwrite moveto?
848
849	my $self = $class->SUPER::new (	1017	my $self = $class->SUPER::new (
850	bg => [1, 1, 1, 1],	1018	bg => [1, 1, 1, 1],
851	border_bg => [1, 1, 1, 1],	1019	border_bg => [1, 1, 1, 1],
852	border => 0.6,	1020	border => 0.6,
		1021	is_toplevel => 1,
853	can_events => 1,	1022	can_events => 1,
854	@_	1023	@_
855	);	1024	);
856		1025
857	$self->{title} &&= new CFClient::UI::Label	1026	$self->{title} &&= new CFClient::UI::Label
858	align => 0,	1027	align => 0,
…		…
877	$h + $self->border * 2,	1046	$h + $self->border * 2,
878	)	1047	)
879	}	1048	}
880		1049
881	sub size_allocate {	1050	sub size_allocate {
882	my ($self, $w, $h) = @_;	1051	my ($self, $w, $h, $changed) = @_;
		1052
		1053	return unless $changed;
883		1054
884	$h -= List::Util::max 0, $self->border * 2;	1055	$h -= List::Util::max 0, $self->border * 2;
885	$w -= List::Util::max 0, $self->border * 2;	1056	$w -= List::Util::max 0, $self->border * 2;
886		1057
887	$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)
888	if $self->{title};	1059	if $self->{title};
889		1060
890	$self->child->configure ($self->border, $self->border, $w, $h);	1061	$self->child->configure ($self->border, $self->border, $w, $h);
891	}	1062	}
892		1063
…		…
911	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
912		1083
913	my $dx = $ev->{x} - $ox;	1084	my $dx = $ev->{x} - $ox;
914	my $dy = $ev->{y} - $oy;	1085	my $dy = $ev->{y} - $oy;
915		1086
		1087	$self->{user_x} = $wx + $dx * $mx;
		1088	$self->{user_y} = $wy + $dy * $my;
916	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1089	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
917	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1090	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
918	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1091	$self->move ($self->{user_x}, $self->{user_y});
919	$self->check_size;	1092	$self->realloc;
920	};	1093	};
921		1094
922	} elsif ($lr ^ $td) {	1095	} elsif ($lr ^ $td) {
923	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1096	my ($ox, $oy) = ($ev->{x}, $ev->{y});
924	my ($bx, $by) = ($self->{x}, $self->{y});	1097	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
926	$self->{motion} = sub {	1099	$self->{motion} = sub {
927	my ($ev, $x, $y) = @_;	1100	my ($ev, $x, $y) = @_;
928		1101
929	($x, $y) = ($ev->{x}, $ev->{y});	1102	($x, $y) = ($ev->{x}, $ev->{y});
930		1103
931	$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});
932	$self->update;	1108	$self->realloc;
933	};	1109	};
934	}	1110	}
935	}	1111	}
936		1112
937	sub button_up {	1113	sub button_up {
…		…
950	my ($self) = @_;	1126	my ($self) = @_;
951		1127
952	my ($w, $h ) = ($self->{w}, $self->{h});	1128	my ($w, $h ) = ($self->{w}, $self->{h});
953	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1129	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954		1130
955	glEnable GL_BLEND;
956	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957	glEnable GL_TEXTURE_2D;	1131	glEnable GL_TEXTURE_2D;
958	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959		1133
960	my $border = $self->border;	1134	my $border = $self->border;
961		1135
962	glColor @{ $self->{border_bg} };	1136	glColor @{ $self->{border_bg} };
963	$tex[1]->draw_quad (0, 0, $w, $border);	1137	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
964	$tex[3]->draw_quad (0, $border, $border, $ch);	1138	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1139	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1140	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967		1141
968	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1142	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969	my $bg = $tex[0];	1143	my $bg = $tex[0];
970		1144
971	# TODO: repeat texture not scale	1145	# TODO: repeat texture not scale
…		…
975	glColor @{ $self->{bg} };	1149	glColor @{ $self->{bg} };
976		1150
977	$bg->{s} = $rep_x;	1151	$bg->{s} = $rep_x;
978	$bg->{t} = $rep_y;	1152	$bg->{t} = $rep_y;
979	$bg->{wrap_mode} = 1;	1153	$bg->{wrap_mode} = 1;
980	$bg->draw_quad ($border, $border, $cw, $ch);	1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1155	}
981		1156
982	glDisable GL_TEXTURE_2D;	1157	glDisable GL_TEXTURE_2D;
983	glDisable GL_BLEND;
984	}
985		1158
986	$self->{title}->draw if $self->{title};	1159	$self->{title}->draw if $self->{title};
987		1160
988	$self->child->draw;	1161	$self->child->draw;
989	}	1162	}
…		…
1001	sub new {	1174	sub new {
1002	my $class = shift;	1175	my $class = shift;
1003		1176
1004	$class->SUPER::new (	1177	$class->SUPER::new (
1005	col_expand => [],	1178	col_expand => [],
1006	@_	1179	@_,
1007	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008	}	1185	}
1009		1186
1010	sub add {	1187	sub add {
1011	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1012		1189
1013	$child->set_parent ($self);	1190	$child->set_parent ($self);
1014	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1015		1192
1016	$child->check_size;	1193	$self->realloc;
1017	}	1194	}
1018		1195
1019	sub children {
1020	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021	}
1022
1023	# 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?
1024	sub clear {	1197	sub clear {
1025	my ($self) = @_;	1198	my ($self) = @_;
1026		1199
1027	my @children = $self->children;	1200	my @children = $self->children;
1028	delete $self->{children};	1201	delete $self->{children};
…		…
1030	for (@children) {	1203	for (@children) {
1031	delete $_->{parent};	1204	delete $_->{parent};
1032	$_->hide;	1205	$_->hide;
1033	}	1206	}
1034		1207
1035	$self->update;	1208	$self->realloc;
1036	}	1209	}
1037		1210
1038	sub get_wh {	1211	sub get_wh {
1039	my ($self) = @_;	1212	my ($self) = @_;
1040		1213
…		…
1067	(sum @$hs),	1240	(sum @$hs),
1068	)	1241	)
1069	}	1242	}
1070		1243
1071	sub size_allocate {	1244	sub size_allocate {
1072	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1073		1246
1074	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1075		1248
1076	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1077	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1078		1251
1079	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1080	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1081	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1082	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1136	}	1309	}
1137	}	1310	}
1138		1311
1139	#############################################################################	1312	#############################################################################
1140		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
1141	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1142		1375
1143	# TODO: wrap into common Box base class
1144
1145	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1146		1377
1147	sub size_request {	1378	sub new {
1148	my ($self) = @_;	1379	my $class = shift;
1149		1380
1150	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1151		1382	vertical => 0,
1152	(	1383	@_,
1153	(List::Util::sum map $_->[0], @alloc),
1154	(List::Util::max map $_->[1], @alloc),
1155	)	1384	)
1156	}	1385	}
1157		1386
1158	sub size_allocate {
1159	my ($self, $w, $h) = @_;
1160
1161	($h, $w) = ($w, $h);
1162
1163	my $children = $self->{children};
1164
1165	my @h = map $_->{req_w}, @$children;
1166
1167	my $req_h = List::Util::sum @h;
1168
1169	if ($req_h > $h) {
1170	# ah well, not enough space
1171	$_ *= $h / $req_h for @h;
1172	} else {
1173	my $exp = List::Util::sum map $_->{expand}, @$children;
1174	$exp ||= 1;
1175
1176	for (0 .. $#$children) {
1177	my $child = $children->[$_];
1178
1179	my $alloc_h = $h[$_];
1180	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181	$h[$_] = $alloc_h;
1182	}
1183	}
1184
1185	CFClient::UI::harmonize \@h;
1186
1187	my $y = 0;
1188	for (0 .. $#$children) {
1189	my $child = $children->[$_];
1190	my $h = $h[$_];
1191	$child->configure ($y, 0, $h, $w);
1192
1193	$y += $h;
1194	}
1195
1196	1
1197	}
1198
1199	#############################################################################	1387	#############################################################################
1200		1388
1201	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1202		1390
1203	# TODO: wrap into common Box base class
1204
1205	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1206		1392
1207	sub size_request {	1393	sub new {
1208	my ($self) = @_;	1394	my $class = shift;
1209		1395
1210	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1211		1397	vertical => 1,
1212	(	1398	@_,
1213	(List::Util::max map $_->[0], @alloc),
1214	(List::Util::sum map $_->[1], @alloc),
1215	)	1399	)
1216	}	1400	}
1217		1401
1218	sub size_allocate {
1219	my ($self, $w, $h) = @_;
1220
1221	my $children = $self->{children};
1222
1223	my @h = map $_->{req_h}, @$children;
1224
1225	my $req_h = List::Util::sum @h;
1226
1227	if ($req_h > $h) {
1228	# ah well, not enough space
1229	$_ *= $h / $req_h for @h;
1230	} else {
1231	my $exp = List::Util::sum map $_->{expand}, @$children;
1232	$exp ||= 1;
1233
1234	for (0 .. $#$children) {
1235	my $child = $children->[$_];
1236
1237	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238	}
1239	}
1240
1241	CFClient::UI::harmonize \@h;
1242
1243	my $y = 0;
1244	for (0 .. $#$children) {
1245	my $child = $children->[$_];
1246	my $h = $h[$_];
1247	$child->configure (0, $y, $w, $h);
1248
1249	$y += $h;
1250	}
1251
1252	1
1253	}
1254
1255	#############################################################################	1402	#############################################################################
1256		1403
1257	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
1258		1405
1259	our @ISA = CFClient::UI::Base::;	1406	our @ISA = CFClient::UI::DrawBG::;
1260		1407
1261	use CFClient::OpenGL;	1408	use CFClient::OpenGL;
1262		1409
1263	sub new {	1410	sub new {
1264	my ($class, %arg) = @_;	1411	my ($class, %arg) = @_;
1265		1412
1266	my $self = $class->SUPER::new (	1413	my $self = $class->SUPER::new (
1267	fg => [1, 1, 1],	1414	fg => [1, 1, 1],
		1415	#bg => none
		1416	#active_bg => none
1268	#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),
1269	fontsize => 1,	1423	fontsize => 1,
1270	text => "",
1271	align => -1,	1424	align => -1,
1272	valign => -1,	1425	valign => -1,
1273	padding => 2,	1426	padding => 2,
1274	layout => new CFClient::Layout,
1275	can_events => 0,	1427	can_events => 0,
1276	%arg	1428	%arg
1277	);	1429	);
1278		1430
1279	if (exists $self->{template}) {	1431	if (exists $self->{template}) {
1280	my $layout = new CFClient::Layout;	1432	my $layout = new CFClient::Layout;
1281	$layout->set_text (delete $self->{template});	1433	$layout->set_text (delete $self->{template});
1282	$self->{template} = $layout;	1434	$self->{template} = $layout;
1283	}	1435	}
1284		1436
1285	$self->set_text (delete $self->{text}) if exists $self->{text};	1437	if (exists $self->{markup}) {
1286	$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	}
1287		1442
1288	$self	1443	$self
1289	}	1444	}
1290		1445
1291	sub escape {	1446	sub escape($) {
1292	local $_ = $_[1];	1447	local $_ = $_[0];
1293		1448
1294	s/&/&amp;/g;	1449	s/&/&amp;/g;
1295	s/>/&gt;/g;	1450	s/>/&gt;/g;
1296	s/</&lt;/g;	1451	s/</&lt;/g;
1297		1452
1298	$_[1]	1453	$_
1299	}	1454	}
1300		1455
1301	sub update {	1456	sub update {
1302	my ($self) = @_;	1457	my ($self) = @_;
1303		1458
1304	delete $self->{texture};	1459	delete $self->{texture};
1305	$self->SUPER::update;	1460	$self->SUPER::update;
1306	}	1461	}
1307		1462
1308	sub reconfigure {
1309	my ($self) = @_;
1310
1311	delete $self->{texture};
1312	}
1313
1314	sub set_text {	1463	sub set_text {
1315	my ($self, $text) = @_;	1464	my ($self, $text) = @_;
1316		1465
1317	return if $self->{text} eq "T$text";	1466	return if $self->{text} eq "T$text";
1318	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1319		1468
		1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1321		1471
1322	delete $self->{texture};	1472	$self->realloc;
1323	$self->update;	1473	$self->update;
1324	$self->check_size;
1325	}	1474	}
1326		1475
1327	sub set_markup {	1476	sub set_markup {
1328	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1329		1478
1330	return if $self->{text} eq "M$markup";	1479	return if $self->{text} eq "M$markup";
1331	$self->{text} = "M$markup";	1480	$self->{text} = "M$markup";
1332		1481
		1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1483
		1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1334		1486
1335	delete $self->{texture};	1487	$self->realloc;
1336	$self->update;	1488	$self->update;
1337	$self->check_size;
1338	}	1489	}
1339		1490
1340	sub size_request {	1491	sub size_request {
1341	my ($self) = @_;	1492	my ($self) = @_;
1342		1493
1343	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1344	$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});
1345	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346		1499
1347	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1348		1501
1349	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1361	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1362	)	1515	)
1363	}	1516	}
1364		1517
1365	sub size_allocate {	1518	sub size_allocate {
1366	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1367		1520
1368	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1369	}	1523	}
1370		1524
1371	sub set_fontsize {	1525	sub set_fontsize {
1372	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1373		1527
1374	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1375	delete $self->{texture};	1529	delete $self->{texture};
1376	$self->check_size;	1530
1377	$self->update;	1531	$self->realloc;
1378	}	1532	}
1379		1533
1380	sub _draw {	1534	sub _draw {
1381	my ($self) = @_;	1535	my ($self) = @_;
1382		1536
		1537	$self->SUPER::_draw; # draw background, if applicable
		1538
1383	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
		1540	$self->{layout}->set_foreground (@{$self->{fg}});
1384	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1385	$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});
1386	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1546
1387	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
1388	};	1558	};
1389		1559
1390	glEnable GL_BLEND;
1391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392	glEnable GL_TEXTURE_2D;	1560	glEnable GL_TEXTURE_2D;
1393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394		1562
		1563	if ($tex->{format} == GL_ALPHA) {
1395	glColor @{$self->{fg}};	1564	glColor @{$self->{fg}};
1396
1397	$self->{ox} = int (
1398	$self->{align} < 0 ? $self->{padding}
1399	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400	: ($self->{w} - $tex->{w}) * 0.5
1401	);
1402
1403	$self->{oy} = int (
1404	$self->{valign} < 0 ? $self->{padding}
1405	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406	: ($self->{h} - $tex->{h}) * 0.5
1407	);
1408
1409	$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	}
1410		1569
1411	glDisable GL_TEXTURE_2D;	1570	glDisable GL_TEXTURE_2D;
1412	glDisable GL_BLEND;
1413	}	1571	}
1414		1572
1415	#############################################################################	1573	#############################################################################
1416		1574
1417	package CFClient::UI::EntryBase;	1575	package CFClient::UI::EntryBase;
…		…
1430	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1431	can_hover => 1,	1589	can_hover => 1,
1432	can_focus => 1,	1590	can_focus => 1,
1433	valign => 0,	1591	valign => 0,
1434	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1435	@_	1594	@_
1436	)	1595	)
1437	}	1596	}
1438		1597
1439	sub _set_text {	1598	sub _set_text {
…		…
1449	$self->{text} = $text;	1608	$self->{text} = $text;
1450		1609
1451	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1452	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1453		1612
1454	$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;
1455	}	1623	}
1456		1624
1457	sub get_text {	1625	sub get_text {
1458	$_[0]{text}	1626	$_[0]{text}
1459	}	1627	}
…		…
1462	my ($self) = @_;	1630	my ($self) = @_;
1463		1631
1464	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1465		1633
1466	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1467	}
1468
1469	sub size_allocate {
1470	my ($self, $w, $h) = @_;
1471
1472	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}
1474
1475	sub set_text {
1476	my ($self, $text) = @_;
1477
1478	$self->{cursor} = length $text;
1479	$self->_set_text ($text);
1480	$self->update;
1481	}	1635	}
1482		1636
1483	sub key_down {	1637	sub key_down {
1484	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1485		1639
…		…
1487	my $sym = $ev->{sym};	1641	my $sym = $ev->{sym};
1488	my $uni = $ev->{unicode};	1642	my $uni = $ev->{unicode};
1489		1643
1490	my $text = $self->get_text;	1644	my $text = $self->get_text;
1491		1645
1492	if ($sym == 8) {	1646	if ($uni == 8) {
1493	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1647	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494	} elsif ($sym == 127) {	1648	} elsif ($uni == 127) {
1495	substr $text, $self->{cursor}, 1, "";	1649	substr $text, $self->{cursor}, 1, "";
1496	} elsif ($sym == CFClient::SDLK_LEFT) {	1650	} elsif ($sym == CFClient::SDLK_LEFT) {
1497	--$self->{cursor} if $self->{cursor};	1651	--$self->{cursor} if $self->{cursor};
1498	} elsif ($sym == CFClient::SDLK_RIGHT) {	1652	} elsif ($sym == CFClient::SDLK_RIGHT) {
1499	++$self->{cursor} if $self->{cursor} < length $self->{text};	1653	++$self->{cursor} if $self->{cursor} < length $self->{text};
1500	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1501	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1502	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1503	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1504	} elsif ($sym == 27) {	1658	} elsif ($uni == 27) {
1505	$self->emit ('escape');	1659	$self->_emit ('escape');
1506	} elsif ($uni) {	1660	} elsif ($uni) {
1507	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1508	}	1662	}
1509		1663
1510	$self->_set_text ($text);	1664	$self->_set_text ($text);
1511	$self->update;	1665
		1666	$self->realloc;
1512	}	1667	}
1513		1668
1514	sub focus_in {	1669	sub focus_in {
1515	my ($self) = @_;	1670	my ($self) = @_;
1516		1671
…		…
1596	if ($sym == 13) {	1751	if ($sym == 13) {
1597	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1598	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1599	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1600	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1601	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1602	$self->update;	1757	$self->update;
1603		1758
1604	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1605	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1606	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1645	my $class = shift;	1800	my $class = shift;
1646		1801
1647	$class->SUPER::new (	1802	$class->SUPER::new (
1648	padding => 4,	1803	padding => 4,
1649	fg => [1, 1, 1],	1804	fg => [1, 1, 1],
1650	bg => [1, 1, 1, 0.2],
1651	active_fg => [0, 0, 1],	1805	active_fg => [0, 0, 1],
1652	can_hover => 1,	1806	can_hover => 1,
1653	align => 0,	1807	align => 0,
1654	valign => 0,	1808	valign => 0,
1655	can_events => 1,	1809	can_events => 1,
1656	@_	1810	@_
1657	)	1811	)
1658	}	1812	}
1659		1813
		1814	sub activate { }
		1815
1660	sub button_up {	1816	sub button_up {
1661	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1662		1818
		1819	$self->emit ("activate")
1663	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1664	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1665	$self->emit ("activate");
1666	}
1667	}	1822	}
1668		1823
1669	sub _draw {	1824	sub _draw {
1670	my ($self) = @_;	1825	my ($self) = @_;
1671		1826
…		…
1673		1828
1674	if ($GRAB == $self) {	1829	if ($GRAB == $self) {
1675	$self->{fg} = $self->{active_fg};	1830	$self->{fg} = $self->{active_fg};
1676	}	1831	}
1677		1832
1678	glEnable GL_BLEND;
1679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680	glEnable GL_TEXTURE_2D;	1833	glEnable GL_TEXTURE_2D;
1681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1834	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682	glColor 0, 0, 0, 1;	1835	glColor 0, 0, 0, 1;
1683		1836
1684	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1837	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685		1838
1686	glDisable GL_TEXTURE_2D;	1839	glDisable GL_TEXTURE_2D;
1687	glDisable GL_BLEND;
1688		1840
1689	$self->SUPER::_draw;	1841	$self->SUPER::_draw;
1690	}	1842	}
1691		1843
1692	#############################################################################	1844	#############################################################################
…		…
1706		1858
1707	$class->SUPER::new (	1859	$class->SUPER::new (
1708	padding => 2,	1860	padding => 2,
1709	fg => [1, 1, 1],	1861	fg => [1, 1, 1],
1710	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],
1711	state => 0,	1865	state => 0,
1712	can_hover => 1,	1866	can_hover => 1,
1713	@_	1867	@_
1714	)	1868	)
1715	}	1869	}
…		…
1724	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1725		1879
1726	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1729	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1730	}	1884	}
1731	}	1885	}
1732		1886
1733	sub _draw {	1887	sub _draw {
1734	my ($self) = @_;	1888	my ($self) = @_;
…		…
1739		1893
1740	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;
1741		1895
1742	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743		1897
1744	glEnable GL_BLEND;	1898	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1899
1745	glEnable GL_TEXTURE_2D;	1900	glEnable GL_TEXTURE_2D;
1746	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748	my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750	$tex->draw_quad (0, 0, $s, $s);	1901	$tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752	glDisable GL_TEXTURE_2D;	1902	glDisable GL_TEXTURE_2D;
1753	glDisable GL_BLEND;
1754	}	1903	}
1755		1904
1756	#############################################################################	1905	#############################################################################
1757		1906
1758	package CFClient::UI::Image;	1907	package CFClient::UI::Image;
…		…
1801	glTranslate 0, -$self->{w}, 0;	1950	glTranslate 0, -$self->{w}, 0;
1802		1951
1803	($w, $h) = ($h, $w);	1952	($w, $h) = ($h, $w);
1804	}	1953	}
1805		1954
1806	glEnable GL_BLEND;
1807	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808	glEnable GL_TEXTURE_2D;	1955	glEnable GL_TEXTURE_2D;
1809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810		1957
1811	$tex->draw_quad (0, 0, $w, $h);	1958	$tex->draw_quad_alpha (0, 0, $w, $h);
1812		1959
1813	glDisable GL_BLEND;
1814	glDisable GL_TEXTURE_2D;	1960	glDisable GL_TEXTURE_2D;
1815	}	1961	}
1816		1962
1817	#############################################################################	1963	#############################################################################
1818		1964
…		…
2007	qw(s1_slider.png s1_slider_bg.png);	2153	qw(s1_slider.png s1_slider_bg.png);
2008		2154
2009	sub new {	2155	sub new {
2010	my $class = shift;	2156	my $class = shift;
2011		2157
2012	# range [value, low, high, page]	2158	# range [value, low, high, page, unit]
2013		2159
2014	# TODO: 0-width page	2160	# TODO: 0-width page
2015	# TODO: req_w/h are wrong with vertical	2161	# TODO: req_w/h are wrong with vertical
2016	# TODO: calculations are off	2162	# TODO: calculations are off
2017	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2018	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2019	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],
2020	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2021	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2022	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2023	vertical => 0,	2171	vertical => 0,
2024	can_hover => 1,	2172	can_hover => 1,
2025	inner_pad => 5,	2173	inner_pad => 0.02,
2026	@_	2174	@_
2027	);	2175	);
2028		2176
		2177	$self->set_value ($self->{range}[0]);
		2178	$self->update;
		2179
2029	$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	}
2030	}	2215	}
2031		2216
2032	sub size_request {	2217	sub size_request {
2033	my ($self) = @_;	2218	my ($self) = @_;
2034		2219
…		…
2040		2225
2041	sub button_down {	2226	sub button_down {
2042	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2043		2228
2044	$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
2045	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2046	}	2234	}
2047		2235
2048	sub mouse_motion {	2236	sub mouse_motion {
2049	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
2050		2238
2051	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
2052	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2053		2258
2054	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055		2260
2056	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2261	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2262	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058		2263
2059	$x -= $inner_pad_px; # substract the padding	2264	$value = ($value - $lo) / $range;
2060	$x = $x * ($hi - $lo) / $inner_w + $lo;	2265	$value = $value * $self->{scale} + $self->{offset};
2061	$x = $lo if $x < $lo;
2062	$x = $hi - $page if $x > $hi - $page;
2063	$self->{range}[0] = $x;
2064		2266
2065	$self->emit (changed => $x);	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2066	$self->update;	2268	$self->{knob_w} = $knob_w;
2067	}	2269	});
2068	}
2069		2270
2070	# the inner_* stuff is for generating a padding for the slider handle,	2271	$self->SUPER::update;
2071	# so that the handle doesn't leave the texture. This calculation isn't 100%
2072	# correct propably, but it does the job for now
2073	sub _calc_inner_pad_px {
2074	my ($self, $w) = @_;
2075	($w / 100) * $self->{inner_pad} # % to pixels
2076	}	2272	}
2077		2273
2078	sub _draw {	2274	sub _draw {
2079	my ($self) = @_;	2275	my ($self) = @_;
2080		2276
2081	$self->SUPER::_draw ();	2277	$self->SUPER::_draw ();
2082		2278
2083	my ($w, $h) = @$self{qw(w h)};	2279	glScale $self->{w}, $self->{h};
2084		2280
2085	if ($self->{vertical}) {	2281	if ($self->{vertical}) {
2086	# draw a vertical slider like a rotated horizontal slider	2282	# draw a vertical slider like a rotated horizontal slider
2087		2283
		2284	glTranslate 1, 0, 0;
2088	glRotate 90, 0, 0, 1;	2285	glRotate 90, 0, 0, 1;
2089	glTranslate 0, -$self->{w}, 0;
2090
2091	($w, $h) = ($h, $w);
2092	}	2286	}
2093		2287
2094	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2288	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2289	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096		2290
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099	$hi = $value + 1 if $lo == $hi;
2100
2101	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104	$page = int $page * $inner_w / ($hi - $lo);
2105	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107	$w -= $page;
2108	$page &= ~1;
2109	glTranslate $page * 0.5, 0, 0;
2110	$page ||= 2;
2111
2112	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115	glEnable GL_BLEND;
2116	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117	glEnable GL_TEXTURE_2D;	2291	glEnable GL_TEXTURE_2D;
2118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2292	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119		2293
2120	# draw background	2294	# draw background
2121	$tex[1]->draw_quad (0, 0, $w, $h);	2295	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122		2296
2123	# draw handle	2297	# draw handle
2124	$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);
2125		2299
2126	glDisable GL_BLEND;
2127	glDisable GL_TEXTURE_2D;	2300	glDisable GL_TEXTURE_2D;
2128	}	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 (@_) }
2129		2343
2130	#############################################################################	2344	#############################################################################
2131		2345
2132	package CFClient::UI::TextView;	2346	package CFClient::UI::TextView;
2133		2347
…		…
2142	fontsize => 1,	2356	fontsize => 1,
2143	can_events => 0,	2357	can_events => 0,
2144	#font => default_font	2358	#font => default_font
2145	@_,	2359	@_,
2146		2360
2147	layout => (new CFClient::Layout),	2361	layout => (new CFClient::Layout 1),
2148	par => [],	2362	par => [],
2149	height => 0,	2363	height => 0,
2150	children => [	2364	children => [
2151	(new CFClient::UI::Empty expand => 1),	2365	(new CFClient::UI::Empty expand => 1),
2152	(new CFClient::UI::Slider vertical => 1),	2366	(new CFClient::UI::Slider vertical => 1),
…		…
2163		2377
2164	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2165	$self->reflow;	2379	$self->reflow;
2166	}	2380	}
2167		2381
2168	sub text_height {
2169	my ($self, $text) = @_;
2170
2171	my $layout = $self->{layout};
2172
2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174	$layout->set_width ($self->{children}[0]{w});
2175	$layout->set_text ($text);
2176
2177	($layout->size)[1]
2178	}
2179
2180	sub reflow {
2181	my ($self) = @_;
2182
2183	$self->{need_reflow}++;
2184	$self->update;
2185	}
2186
2187	sub size_allocate {	2382	sub size_allocate {
2188	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2189		2384
2190	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2191		2388
2192	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2193	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2194	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2195		2392
2196	$self->reflow;	2393	$self->reflow;
2197	}	2394	}
2198		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
2199	sub add_paragraph {	2430	sub add_paragraph {
2200	my ($self, $color, $text) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2201		2432
2202	#TODO: intelligently "reformat" paragraph	2433	for my $line (split /\n/, $text) {
2203		2434	my ($w, $h) = $self->text_size ($line);
2204	my $height = $self->text_height ($text);
2205
2206	$self->{height} += $height;	2435	$self->{height} += $h;
		2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2437	}
2207		2438
2208	push @{$self->{par}}, [$height, $color, $text];
2209
2210	$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]);
2211	$self->{children}[1]->update;
2212	}	2440	}
2213		2441
2214	sub update {	2442	sub update {
2215	my ($self) = @_;	2443	my ($self) = @_;
2216		2444
…		…
2218		2446
2219	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2220		2448
2221	delete $self->{texture};	2449	delete $self->{texture};
2222		2450
2223	$ROOT->on_refresh ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2224	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2225	my $height = 0;	2455	my $height = 0;
2226		2456
2227	$height += $_->[0] = $self->text_height ($_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2228	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	}
2229		2472
2230	$self->{height} = $height;	2473	$self->{height} = $height;
2231		2474
2232	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233		2476
2234	delete $self->{texture};	2477	delete $self->{texture};
2235	}	2478	}
2236		2479
2237	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238	glClearColor 0, 0, 0, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2240		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
2241	glEnable GL_BLEND;	2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
2242	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246	my $top = int $self->{children}[1]{range}[0];
2247
2248	my $y0 = $top;
2249	my $y1 = $top + $self->{h};
2250
2251	my $y = 0;
2252
2253	my $layout = $self->{layout};
2254
2255	$layout->set_font ($self->{font}) if $self->{font};
2256		2498
2257	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2500	my $h = $par->[1];
2259		2501
2260	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]);
2261	$layout->set_text ($par->[2]);	2505	$layout->set_markup ($par->[4]);
2262		2506
2263	glColor @{ $par->[1] };	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	my ($W, $H) = $layout->size;	2508
2265	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;
2266	}	2511	}
2267		2512
2268	$y += $h;	2513	$y += $h;
2269	}	2514	}
2270		2515
2271	glDisable GL_TEXTURE_2D;
2272	glDisable GL_BLEND;	2516	glDisable GL_BLEND;
2273	};	2517	};
2274	});	2518	});
2275	}	2519	}
2276		2520
2277	sub _draw {	2521	sub _draw {
2278	my ($self) = @_;	2522	my ($self) = @_;
2279		2523
2280	glEnable GL_BLEND;
2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282	glEnable GL_TEXTURE_2D;	2524	glEnable GL_TEXTURE_2D;
2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284	glColor 1, 1, 1, 1;	2526	glColor 1, 1, 1, 1;
2285	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2527	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286	glDisable GL_TEXTURE_2D;	2528	glDisable GL_TEXTURE_2D;
2287	glDisable GL_BLEND;
2288		2529
2289	$self->{children}[1]->draw;	2530	$self->{children}[1]->draw;
2290		2531
2291	}	2532	}
2292		2533
…		…
2340		2581
2341	sub new {	2582	sub new {
2342	my $class = shift;	2583	my $class = shift;
2343		2584
2344	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2345	state => 0,	2586	state => 0,
2346	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2347	@_	2588	@_
2348	);	2589	);
2349		2590
2350	if ($self->{state}) {
2351	$self->{state} = 0;
2352	$self->toggle_flopper;
2353	}
2354
2355	$self	2591	$self
2356	}	2592	}
2357		2593
2358	sub toggle_flopper {	2594	sub toggle_flopper {
2359	my ($self) = @_;	2595	my ($self) = @_;
2360		2596
2361	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2362	if ($self->{state} = !$self->{state}) {
2363	$CFClient::UI::ROOT->add ($self->{other});
2364	$self->{other}->move ($self->coord2global (0, $self->{h}));
2365	$self->emit ("open");
2366	} else {
2367	$CFClient::UI::ROOT->remove ($self->{other});
2368	$self->emit ("close");
2369	}
2370
2371	$self->emit (changed => $self->{state});
2372	}	2598	}
2373		2599
2374	#############################################################################	2600	#############################################################################
2375		2601
2376	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2386	@_,	2612	@_,
2387	can_events => 0,	2613	can_events => 0,
2388	)	2614	)
2389	}	2615	}
2390		2616
2391	sub set_markup {	2617	sub set_tooltip_from {
2392	my ($self, $text) = @_;	2618	my ($self, $widget) = @_;
2393		2619
2394	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2620	$self->add (new CFClient::UI::Label
2395	$self->{label}->set_markup ($text);	2621	markup => $widget->{tooltip},
2396	$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	);
2397	}	2628	}
2398		2629
2399	sub size_request {	2630	sub size_request {
2400	my ($self) = @_;	2631	my ($self) = @_;
2401		2632
2402	$self->child->set_max_size ($::WIDTH * 0.3);
2403
2404	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2633	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405		2634
2406	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2407	}	2636	}
2408		2637
2409	sub size_allocate {	2638	sub size_allocate {
2410	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2411		2640
		2641	return unless $changed;
		2642
2412	$self->SUPER::size_allocate ($w - 4, $h - 4);	2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2413	}	2644	}
2414		2645
2415	sub _draw {	2646	sub _draw {
2416	my ($self) = @_;	2647	my ($self) = @_;
2417		2648
2418	glPushMatrix;
2419	glTranslate 0.375, 0.375;	2649	glTranslate 0.375, 0.375;
2420		2650
2421	my ($w, $h) = @$self{qw(w h)};	2651	my ($w, $h) = @$self{qw(w h)};
2422		2652
2423	glColor 1, 0.8, 0.4;	2653	glColor 1, 0.8, 0.4;
…		…
2434	glVertex 0 , $h;	2664	glVertex 0 , $h;
2435	glVertex $w, $h;	2665	glVertex $w, $h;
2436	glVertex $w, 0;	2666	glVertex $w, 0;
2437	glEnd;	2667	glEnd;
2438		2668
2439	glPopMatrix;	2669	glTranslate 2 - 0.375, 2 - 0.375;
2440		2670
2441	glTranslate 2, 2;
2442	$self->SUPER::_draw;	2671	$self->SUPER::_draw;
2443	}	2672	}
2444		2673
2445	#############################################################################	2674	#############################################################################
2446		2675
…		…
2451	use CFClient::OpenGL;	2680	use CFClient::OpenGL;
2452		2681
2453	sub new {	2682	sub new {
2454	my $class = shift;	2683	my $class = shift;
2455		2684
2456	$class->SUPER::new (	2685	my $self = $class->SUPER::new (
2457	aspect => 1,	2686	aspect => 1,
		2687	can_events => 0,
2458	@_,	2688	@_,
2459	)	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
2460	}	2706	}
2461		2707
2462	sub size_request {	2708	sub size_request {
2463	(32, 8)	2709	(32, 8)
2464	}	2710	}
2465		2711
		2712	sub update {
		2713	my ($self) = @_;
		2714
		2715	return unless $self->{visible};
		2716
		2717	$self->SUPER::update;
		2718	}
		2719
2466	sub _draw {	2720	sub _draw {
2467	my ($self) = @_;	2721	my ($self) = @_;
2468		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
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2734	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2735
2471	# TODO animation
2472	if ($tex) {	2736	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2737	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2739	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2740	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2480	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++;
2481	}	2793	}
2482	}	2794	}
2483		2795
2484	#############################################################################	2796	#############################################################################
2485		2797
…		…
2521		2833
2522	# popup given the event (must be a mouse button down event currently)	2834	# popup given the event (must be a mouse button down event currently)
2523	sub popup {	2835	sub popup {
2524	my ($self, $ev) = @_;	2836	my ($self, $ev) = @_;
2525		2837
2526	$self->emit ("popdown");	2838	$self->_emit ("popdown");
2527		2839
2528	# maybe save $GRAB? must be careful about events...	2840	# maybe save $GRAB? must be careful about events...
2529	$GRAB = $self;	2841	$GRAB = $self;
2530	$self->{button} = $ev->{button};	2842	$self->{button} = $ev->{button};
2531		2843
…		…
2546		2858
2547	if ($ev->{button} == $self->{button}) {	2859	if ($ev->{button} == $self->{button}) {
2548	undef $GRAB;	2860	undef $GRAB;
2549	$self->hide;	2861	$self->hide;
2550		2862
2551	$self->emit ("popdown");	2863	$self->_emit ("popdown");
2552	$self->{hover}[1]->() if $self->{hover};	2864	$self->{hover}[1]->() if $self->{hover};
2553	}	2865	}
2554	}	2866	}
2555		2867
2556	#############################################################################	2868	#############################################################################
2557		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	@_,
		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;
		2976	}
		2977
		2978	#############################################################################
		2979
2558	package CFClient::UI::Root;	2980	package CFClient::UI::Root;
2559		2981
2560	our @ISA = CFClient::UI::Container::;	2982	our @ISA = CFClient::UI::Container::;
2561		2983
2562	use CFClient::OpenGL;	2984	use CFClient::OpenGL;
2563		2985
2564	sub check_size {	2986	sub new {
2565	my ($self) = @_;	2987	my $class = shift;
2566		2988
2567	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2989	my $self = $class->SUPER::new (
2568	}	2990	visible => 1,
		2991	@_,
		2992	);
2569		2993
2570	sub size_request {	2994	Scalar::Util::weaken ($self->{root} = $self);
2571	($::WIDTH, $::HEIGHT)	2995
		2996	$self
2572	}	2997	}
2573		2998
2574	sub configure {	2999	sub configure {
2575	my ($self, $x, $y, $w, $h) = @_;	3000	my ($self, $x, $y, $w, $h) = @_;
2576		3001
2577	$self->SUPER::configure ($x, $y, $w, $h);	3002	$self->{w} = $w;
		3003	$self->{h} = $h;
		3004	}
2578		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
2579	for my $child (@{$self->{children}}) {	3024	for my $child ($self->children) {
2580	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)};
2581		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
2582	$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;
2583	$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
2584	$child->configure ($X, $Y, $W,$H);	3038	$child->configure ($X, $Y, $W, $H);
2585	}	3039	}
2586	}	3040	}
2587		3041
2588	sub _topleft {	3042	sub coord2local {
2589	my ($self, $x, $y) = @_;	3043	my ($self, $x, $y) = @_;
2590		3044
2591	($x, $y)	3045	($x, $y)
2592	}	3046	}
2593		3047
		3048	sub coord2global {
		3049	my ($self, $x, $y) = @_;
		3050
		3051	($x, $y)
		3052	}
		3053
2594	sub update {	3054	sub update {
2595	my ($self) = @_;	3055	my ($self) = @_;
2596		3056
2597	$self->check_size;	3057	$::WANT_REFRESH++;
2598	::refresh ();
2599	}	3058	}
2600		3059
2601	sub add {	3060	sub add {
2602	my ($self, $child) = @_;	3061	my ($self, @children) = @_;
2603		3062
		3063	for my $child (@children) {
		3064	$child->{is_toplevel} = 1;
		3065
2604	# integerize window positions	3066	# integerise window positions
2605	$child->{x} = int $child->{x};	3067	$child->{x} = int $child->{x};
2606	$child->{y} = int $child->{y};	3068	$child->{y} = int $child->{y};
		3069	}
2607		3070
2608	$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	}
2609	}	3084	}
2610		3085
2611	sub on_refresh {	3086	sub on_refresh {
2612	my ($self, $id, $cb) = @_;	3087	my ($self, $id, $cb) = @_;
2613		3088
2614	$self->{refresh_hook}{$id} = $cb;	3089	$self->{refresh_hook}{$id} = $cb;
2615	}	3090	}
2616		3091
		3092	sub on_post_alloc {
		3093	my ($self, $id, $cb) = @_;
		3094
		3095	$self->{post_alloc_hook}{$id} = $cb;
		3096	}
		3097
2617	sub draw {	3098	sub draw {
2618	my ($self) = @_;	3099	my ($self) = @_;
2619		3100
2620	while (my $rcb = delete $self->{refresh_hook}) {	3101	while ($self->{refresh_hook}) {
2621	$_->() 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}};
2622	}	3159	}
2623		3160
2624	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3161	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3162	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626	glClear GL_COLOR_BUFFER_BIT;	3163	glClear GL_COLOR_BUFFER_BIT;
2627		3164
2628	glMatrixMode GL_PROJECTION;	3165	glMatrixMode GL_PROJECTION;
2629	glLoadIdentity;	3166	glLoadIdentity;
2630	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3167	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631	glMatrixMode GL_MODELVIEW;	3168	glMatrixMode GL_MODELVIEW;
2632	glLoadIdentity;	3169	glLoadIdentity;
2633		3170
2634	$self->_draw;	3171	$self->_draw;
2635	}	3172	}
2636		3173
2637	#############################################################################	3174	#############################################################################
2638		3175
2639	package CFClient::UI::Inventory;
2640
2641	our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643	sub new {
2644	my $class = shift;
2645
2646	my $self = $class->SUPER::new (
2647	scrolled => (new CFClient::UI::VBox),
2648	@_,
2649	);
2650
2651	$self
2652	}
2653
2654	sub set_items {
2655	my ($self, $items) = @_;
2656
2657	$self->{scrolled}->clear;
2658	return unless $items;
2659
2660	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662	$self->{real_items} = \@items;
2663
2664	for my $item (@items) {
2665	my $desc = $item->{nrof} < 2
2666	? $item->{name}
2667	: "$item->{nrof} $item->{name_pl}";
2668
2669	my $hb = new CFClient::UI::HBox;
2670
2671	$hb->add (my $f = new CFClient::UI::Face
2672	can_events => 0,
2673	face => $item->{face},
2674	anim => $item->{anim},
2675	animspeed => $item->{animspeed},
2676	expand => 1,
2677	);
2678	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679	$self->{scrolled}->add ($hb);
2680	}
2681
2682	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683	}
2684
2685	sub size_request {
2686	my ($self) = @_;
2687	(100, 200)
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI;	3176	package CFClient::UI;
2693		3177
2694	$ROOT = new CFClient::UI::Root;	3178	$ROOT = new CFClient::UI::Root;
2695	$TOOLTIP = new CFClient::UI::Tooltip;	3179	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696		3180
2697	1	3181	1
2698		3182

Diff Legend

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