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.238 by root, Thu May 25 21:48:22 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
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
232	$self->{y} = $y;	294	$self->{y} = $y;
233	$self->update;	295	$self->update;
234	}	296	}
235		297
236	if ($self->{w} != $w || $self->{h} != $h) {	298	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	300	}
244	}	301	}
245		302
246	sub size_allocate {	303	sub size_allocate {
247	# nothing to be done	304	# nothing to be done
248	}	305	}
249		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
250	sub children {	314	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}	315	}
262		316
263	sub set_max_size {	317	sub set_max_size {
264	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
265		319
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}	322	}
269		323
270	# return top left coordinates	324	sub set_tooltip {
271	sub _topleft {
272	my ($self, $x, $y) = @_;	325	my ($self, $tooltip) = @_;
273		326
274	$self->{parent}	327	$tooltip =~ s/^\s+//;
275	or Carp::confess "no parent widget in _topleft\n";#d#	328	$tooltip =~ s/\s+$//;
276		329
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
278	}	338	}
279		339
280	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
281	sub coord2local {	341	sub coord2local {
282	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
283		343
284	my ($X, $Y) = $self->_topleft;	344	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	345	}
287		346
288	# translate local coordinates to global coordinate system	347	# translate local coordinates to global coordinate system
289	sub coord2global {	348	sub coord2global {
290	my ($self, $x, $y) = @_;	349	my ($self, $x, $y) = @_;
291		350
292	my ($X, $Y) = $self->_topleft;	351	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	352	}
295		353
296	sub focus_in {	354	sub focus_in {
297	my ($self) = @_;	355	my ($self) = @_;
298		356
299	return if $FOCUS == $self;	357	return if $FOCUS == $self;
300	return unless $self->{can_focus};	358	return unless $self->{can_focus};
301		359
302	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
303		361
304	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
305		363
306	$focus->update if $focus;	364	$focus->update if $focus;
307	$FOCUS->update;	365	$FOCUS->update;
308	}	366	}
309		367
…		…
312		370
313	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
314		372
315	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
316		374
317	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
318		376
319	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
320	}	381	}
321		382
322	sub mouse_motion { }	383	sub mouse_motion { }
323	sub button_up { }	384	sub button_up { }
324	sub key_down { }	385	sub key_down { }
325	sub key_up { }	386	sub key_up { }
326		387
327	sub button_down {	388	sub button_down {
328	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
329		390
330	$self->focus_in;	391	$self->focus_in;
…		…
364	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
365	glPushMatrix;	426	glPushMatrix;
366	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
369	glVertex 0 , 0;	430	glVertex 0 , 0;
370	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
371	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
372	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
373	glEnd;	434	glEnd;
374	glPopMatrix;	435	glPopMatrix;
375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376	}	437	}
377	}	438	}
378		439
379	sub _draw {	440	sub _draw {
380	my ($self) = @_;	441	my ($self) = @_;
…		…
396		457
397	sub set_parent {	458	sub set_parent {
398	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
399		460
400	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
		462
		463	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
		466	# TODO: req_w _does_change after ->reconfigure
		467	$self->check_size
		468	unless exists $self->{req_w};
		469
		470	$self->show;
401	}	471	}
402		472
403	sub check_size {	473	sub check_size {
404	my ($self) = @_;	474	my ($self, $forced) = @_;
405		475
406	$self->{parent}	476	$self->{force_alloc} = 1 if $forced;
407	or return 1;	477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
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	}	478	}
428		479
429	sub update {	480	sub update {
430	my ($self) = @_;	481	my ($self) = @_;
431		482
…		…
437	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
438		489
439	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
440	}	491	}
441		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
442	sub emit {	499	sub emit {
443	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
444		501
445	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
446	}	504	}
447		505
448	sub DESTROY {	506	sub DESTROY {
449	my ($self) = @_;	507	my ($self) = @_;
450		508
		509	delete $WIDGET{$self+0};
451	#$self->deactivate;	510	#$self->deactivate;
452	}	511	}
453		512
454	#############################################################################	513	#############################################################################
455		514
…		…
464	my $class = shift;	523	my $class = shift;
465		524
466	# range [value, low, high, page]	525	# range [value, low, high, page]
467		526
468	$class->SUPER::new (	527	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
471	@_	530	@_
472	)	531	)
473	}	532	}
474		533
475	sub _draw {	534	sub _draw {
476	my ($self) = @_;	535	my ($self) = @_;
477		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
479		543
480	glEnable GL_BLEND;	544	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
483		547
484	glBegin GL_QUADS;	548	glBegin GL_QUADS;
485	glVertex 0 , 0;	549	glVertex 0 , 0;
486	glVertex 0 , $h;	550	glVertex 0 , $h;
487	glVertex $w, $h;	551	glVertex $w, $h;
488	glVertex $w, 0;	552	glVertex $w, 0;
489	glEnd;	553	glEnd;
490		554
491	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
492	}	557	}
493		558
494	#############################################################################	559	#############################################################################
495		560
496	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
528		593
529	$self	594	$self
530	}	595	}
531		596
532	sub add {	597	sub add {
533	my ($self, $child) = @_;	598	my ($self, @widgets) = @_;
534		599
535	$child->set_parent ($self);	600	$_->set_parent ($self)
		601	for @widgets;
536		602
537	use sort 'stable';	603	use sort 'stable';
538		604
539	$self->{children} = [	605	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	606	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	607	@{$self->{children}}, @widgets
542	];	608	];
543		609
544	$child->check_size;	610	$self->check_size (1);
545	$self->update;	611	$self->update;
546	}	612	}
547		613
548	sub children {	614	sub children {
549	@{ $_[0]{children} }	615	@{ $_[0]{children} }
…		…
555	delete $child->{parent};	621	delete $child->{parent};
556	$child->hide;	622	$child->hide;
557		623
558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559		625
560	$self->check_size;	626	$self->check_size (1);
561	$self->update;	627	$self->update;
562	}	628	}
563		629
564	sub clear {	630	sub clear {
565	my ($self) = @_;	631	my ($self) = @_;
…		…
656	}	722	}
657		723
658	sub update {	724	sub update {
659	my ($self) = @_;	725	my ($self) = @_;
660		726
661	$ROOT->on_refresh ($self => sub { $self->render_child });	727	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	728	$self->SUPER::update;
663	}	729	}
664		730
665	sub size_allocate {	731	sub size_allocate {
666	my ($self, $w, $h) = @_;	732	my ($self, $w, $h) = @_;
…		…
679	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
682		748
683	$self->_render;	749	$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	};	750	};
692	}	751	}
693		752
694	sub _draw {	753	sub _draw {
695	my ($self) = @_;	754	my ($self) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	756	my ($w, $h) = ($self->w, $self->h);
698		757
699	my $tex = $self->{texture}	758	my $tex = $self->{texture}
700	or return;	759	or return;
701		760
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
707		764
708	$tex->draw_quad (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		766
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
712	}	768	}
713		769
714	#############################################################################	770	#############################################################################
715		771
716	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
717		773
718	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
719		775
		776	sub new {
		777	my $class = shift;
		778
		779	$class->SUPER::new (
		780	scroll_x => 0,
		781	scroll_y => 1,
		782	@_,
		783	)
		784	}
		785
720	sub size_request {	786	sub size_request {
721	my ($self) = @_;	787	my ($self) = @_;
722		788
723	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	789	@$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		790
726	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
727	}	792	}
728		793
729	sub size_allocate {	794	sub size_allocate {
730	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
731		796
		797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		799
		800	$self->child->configure (0, 0, $w, $h);
732	$self->update;	801	$self->update;
733	}	802	}
734		803
735	sub set_offset {	804	sub set_offset {
736	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
737		806
738	$self->{view_x} = int $x;	807	$self->{view_x} = int $x;
739	$self->{view_y} = int $y;	808	$self->{view_y} = int $y;
740		809
741	$self->update;	810	$self->update;
		811	}
		812
		813	# hmm, this does not work for topleft of $self... but we should not ask for that
		814	sub coord2local {
		815	my ($self, $x, $y) = @_;
		816
		817	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		818	}
		819
		820	sub coord2global {
		821	my ($self, $x, $y) = @_;
		822
		823	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		824	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		825
		826	$self->SUPER::coord2global ($x, $y)
		827	}
		828
		829	sub find_widget {
		830	my ($self, $x, $y) = @_;
		831
		832	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		833	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		834	) {
		835	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		836	} else {
		837	$self->CFClient::UI::Base::find_widget ($x, $y)
		838	}
742	}	839	}
743		840
744	sub _render {	841	sub _render {
745	my ($self) = @_;	842	my ($self) = @_;
746		843
…		…
762		859
763	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
764	vertical => 1,	861	vertical => 1,
765	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
766	connect_changed => sub {	863	connect_changed => sub {
767	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
768	},	865	},
769	;	866	;
770		867
771	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
772	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
773	slider => $slider,	870	slider => $slider,
774	@_,	871	@_,
775	);	872	);
776		873
777	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
…		…
779	$self->add ($self->{slider});	876	$self->add ($self->{slider});
780		877
781	$self	878	$self
782	}	879	}
783		880
		881	sub size_allocate {
		882	my ($self, $w, $h) = @_;
		883
		884	$self->SUPER::size_allocate ($w, $h);
		885
		886	my $child = $self->{vp}->child;
		887	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		888	}
		889
784	#TODO# update range on size_allocate depeneing on child	890	#TODO# update range on size_allocate depending on child
785	# update viewport offset on scroll	891	# update viewport offset on scroll
786		892
787	#############################################################################	893	#############################################################################
788		894
789	package CFClient::UI::Frame;	895	package CFClient::UI::Frame;
…		…
793	use CFClient::OpenGL;	899	use CFClient::OpenGL;
794		900
795	sub new {	901	sub new {
796	my $class = shift;	902	my $class = shift;
797		903
798	my $self = $class->SUPER::new (	904	$class->SUPER::new (
799	bg => [1, 1, 1, 1],	905	bg => undef,
800	border_bg => [1, 1, 1, 1],
801	border => 0.8,
802	@_	906	@_,
803	);	907	)
804
805	$self
806	}	908	}
807		909
808	sub _draw {	910	sub _draw {
809	my ($self) = @_;	911	my ($self) = @_;
810		912
811	my ($w, $h) = ($self->{w}, $self->{h});	913	if ($self->{bg}) {
		914	my ($w, $h) = @$self{qw(w h)};
812		915
813	glEnable GL_BLEND;	916	glEnable GL_BLEND;
814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	917	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815	glEnable GL_TEXTURE_2D;	918	glColor @{ $self->{bg} };
816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817		919
818	# glBegin GL_QUADS;	920	glBegin GL_QUADS;
819	# glColor 0, 0, 0, 0;
820	# glVertex 0 , 0;	921	glVertex 0 , 0;
821	# glVertex 0 , $h;	922	glVertex 0 , $h;
822	# glVertex $w, $h;	923	glVertex $w, $h;
823	# glVertex $w, 0;	924	glVertex $w, 0;
824	# glEnd;	925	glEnd;
825		926
826
827	$self->child->draw;
828	glDisable GL_BLEND;	927	glDisable GL_BLEND;
829	glDisable GL_TEXTURE_2D;	928	}
		929
		930	$self->SUPER::_draw;
830	}	931	}
831		932
832	#############################################################################	933	#############################################################################
833		934
834	package CFClient::UI::FancyFrame;	935	package CFClient::UI::FancyFrame;
…		…
845	my $class = shift;	946	my $class = shift;
846		947
847	# TODO: user_x, user_y, overwrite moveto?	948	# TODO: user_x, user_y, overwrite moveto?
848		949
849	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
850	bg => [1, 1, 1, 1],	951	bg => [1, 1, 1, 1],
851	border_bg => [1, 1, 1, 1],	952	border_bg => [1, 1, 1, 1],
852	border => 0.6,	953	border => 0.6,
		954	is_toplevel => 1,
853	can_events => 1,	955	can_events => 1,
854	@_	956	@_
855	);	957	);
856		958
857	$self->{title} &&= new CFClient::UI::Label	959	$self->{title} &&= new CFClient::UI::Label
858	align => 0,	960	align => 0,
…		…
882	my ($self, $w, $h) = @_;	984	my ($self, $w, $h) = @_;
883		985
884	$h -= List::Util::max 0, $self->border * 2;	986	$h -= List::Util::max 0, $self->border * 2;
885	$w -= List::Util::max 0, $self->border * 2;	987	$w -= List::Util::max 0, $self->border * 2;
886		988
887	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	989	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888	if $self->{title};	990	if $self->{title};
889		991
890	$self->child->configure ($self->border, $self->border, $w, $h);	992	$self->child->configure ($self->border, $self->border, $w, $h);
891	}	993	}
892		994
…		…
950	my ($self) = @_;	1052	my ($self) = @_;
951		1053
952	my ($w, $h ) = ($self->{w}, $self->{h});	1054	my ($w, $h ) = ($self->{w}, $self->{h});
953	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1055	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954		1056
955	glEnable GL_BLEND;
956	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957	glEnable GL_TEXTURE_2D;	1057	glEnable GL_TEXTURE_2D;
958	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1058	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959		1059
960	my $border = $self->border;	1060	my $border = $self->border;
961		1061
962	glColor @{ $self->{border_bg} };	1062	glColor @{ $self->{border_bg} };
963	$tex[1]->draw_quad (0, 0, $w, $border);	1063	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
964	$tex[3]->draw_quad (0, $border, $border, $ch);	1064	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1065	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1066	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967		1067
968	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1068	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969	my $bg = $tex[0];	1069	my $bg = $tex[0];
970		1070
971	# TODO: repeat texture not scale	1071	# TODO: repeat texture not scale
…		…
975	glColor @{ $self->{bg} };	1075	glColor @{ $self->{bg} };
976		1076
977	$bg->{s} = $rep_x;	1077	$bg->{s} = $rep_x;
978	$bg->{t} = $rep_y;	1078	$bg->{t} = $rep_y;
979	$bg->{wrap_mode} = 1;	1079	$bg->{wrap_mode} = 1;
980	$bg->draw_quad ($border, $border, $cw, $ch);	1080	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1081	}
981		1082
982	glDisable GL_TEXTURE_2D;	1083	glDisable GL_TEXTURE_2D;
983	glDisable GL_BLEND;
984	}
985		1084
986	$self->{title}->draw if $self->{title};	1085	$self->{title}->draw if $self->{title};
987		1086
988	$self->child->draw;	1087	$self->child->draw;
989	}	1088	}
…		…
1001	sub new {	1100	sub new {
1002	my $class = shift;	1101	my $class = shift;
1003		1102
1004	$class->SUPER::new (	1103	$class->SUPER::new (
1005	col_expand => [],	1104	col_expand => [],
1006	@_	1105	@_,
1007	)	1106	)
		1107	}
		1108
		1109	sub children {
		1110	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008	}	1111	}
1009		1112
1010	sub add {	1113	sub add {
1011	my ($self, $x, $y, $child) = @_;	1114	my ($self, $x, $y, $child) = @_;
1012		1115
1013	$child->set_parent ($self);	1116	$child->set_parent ($self);
1014	$self->{children}[$y][$x] = $child;	1117	$self->{children}[$y][$x] = $child;
1015		1118
1016	$child->check_size;	1119	$self->check_size (1);
1017	}	1120	}
1018		1121
1019	sub children {
1020	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021	}
1022
1023	# TODO: move to container class maybe? send childs a signal on removal?	1122	# TODO: move to container class maybe? send children a signal on removal?
1024	sub clear {	1123	sub clear {
1025	my ($self) = @_;	1124	my ($self) = @_;
1026		1125
1027	my @children = $self->children;	1126	my @children = $self->children;
1028	delete $self->{children};	1127	delete $self->{children};
…		…
1030	for (@children) {	1129	for (@children) {
1031	delete $_->{parent};	1130	delete $_->{parent};
1032	$_->hide;	1131	$_->hide;
1033	}	1132	}
1034		1133
		1134	$self->check_size (1);
1035	$self->update;	1135	$self->update;
1036	}	1136	}
1037		1137
1038	sub get_wh {	1138	sub get_wh {
1039	my ($self) = @_;	1139	my ($self) = @_;
…		…
1071	sub size_allocate {	1171	sub size_allocate {
1072	my ($self, $w, $h) = @_;	1172	my ($self, $w, $h) = @_;
1073		1173
1074	my ($ws, $hs) = $self->get_wh;	1174	my ($ws, $hs) = $self->get_wh;
1075		1175
1076	my $req_w = sum @$ws;	1176	my $req_w = (sum @$ws) || 1;
1077	my $req_h = sum @$hs;	1177	my $req_h = (sum @$hs) || 1;
1078		1178
1079	# TODO: nicer code && do row_expand	1179	# TODO: nicer code && do row_expand
1080	my @col_expand = @{$self->{col_expand}};	1180	my @col_expand = @{$self->{col_expand}};
1081	@col_expand = (1) x @$ws unless @col_expand;	1181	@col_expand = (1) x @$ws unless @col_expand;
1082	my $col_expand = (sum @col_expand) || 1;	1182	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1316	}
1217		1317
1218	sub size_allocate {	1318	sub size_allocate {
1219	my ($self, $w, $h) = @_;	1319	my ($self, $w, $h) = @_;
1220		1320
		1321	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1322
1221	my $children = $self->{children};	1323	my $children = $self->{children};
1222		1324
1223	my @h = map $_->{req_h}, @$children;	1325	my @h = map $_->{req_h}, @$children;
1224		1326
1225	my $req_h = List::Util::sum @h;	1327	my $req_h = List::Util::sum @h;
…		…
1254		1356
1255	#############################################################################	1357	#############################################################################
1256		1358
1257	package CFClient::UI::Label;	1359	package CFClient::UI::Label;
1258		1360
1259	our @ISA = CFClient::UI::Base::;	1361	our @ISA = CFClient::UI::DrawBG::;
1260		1362
1261	use CFClient::OpenGL;	1363	use CFClient::OpenGL;
1262		1364
1263	sub new {	1365	sub new {
1264	my ($class, %arg) = @_;	1366	my ($class, %arg) = @_;
1265		1367
1266	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
1267	fg => [1, 1, 1],	1369	fg => [1, 1, 1],
		1370	#bg => none
		1371	#active_bg => none
1268	#font => default_font	1372	#font => default_font
		1373	#text => initial text
		1374	#markup => initial narkup
		1375	#max_w => maximum pixel width
		1376	ellipsise => 3, # end
		1377	layout => (new CFClient::Layout),
1269	fontsize => 1,	1378	fontsize => 1,
1270	text => "",
1271	align => -1,	1379	align => -1,
1272	valign => -1,	1380	valign => -1,
1273	padding => 2,	1381	padding => 2,
1274	layout => new CFClient::Layout,
1275	can_events => 0,	1382	can_events => 0,
1276	%arg	1383	%arg
1277	);	1384	);
1278		1385
1279	if (exists $self->{template}) {	1386	if (exists $self->{template}) {
1280	my $layout = new CFClient::Layout;	1387	my $layout = new CFClient::Layout;
1281	$layout->set_text (delete $self->{template});	1388	$layout->set_text (delete $self->{template});
1282	$self->{template} = $layout;	1389	$self->{template} = $layout;
1283	}	1390	}
1284		1391
1285	$self->set_text (delete $self->{text}) if exists $self->{text};	1392	if (exists $self->{markup}) {
1286	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1393	$self->set_markup (delete $self->{markup});
		1394	} else {
		1395	$self->set_text (delete $self->{text});
		1396	}
1287		1397
1288	$self	1398	$self
1289	}	1399	}
1290		1400
1291	sub escape {	1401	sub escape($) {
1292	local $_ = $_[1];	1402	local $_ = $_[0];
1293		1403
1294	s/&/&amp;/g;	1404	s/&/&amp;/g;
1295	s/>/&gt;/g;	1405	s/>/&gt;/g;
1296	s/</&lt;/g;	1406	s/</&lt;/g;
1297		1407
1298	$_[1]	1408	$_
1299	}	1409	}
1300		1410
1301	sub update {	1411	sub update {
1302	my ($self) = @_;	1412	my ($self) = @_;
1303		1413
1304	delete $self->{texture};	1414	delete $self->{texture};
1305	$self->SUPER::update;	1415	$self->SUPER::update;
1306	}	1416	}
1307		1417
1308	sub reconfigure {
1309	my ($self) = @_;
1310
1311	delete $self->{texture};
1312	}
1313
1314	sub set_text {	1418	sub set_text {
1315	my ($self, $text) = @_;	1419	my ($self, $text) = @_;
1316		1420
1317	return if $self->{text} eq "T$text";	1421	return if $self->{text} eq "T$text";
1318	$self->{text} = "T$text";	1422	$self->{text} = "T$text";
1319		1423
		1424	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320	$self->{layout}->set_text ($text);	1425	$self->{layout}->set_text ($text);
1321		1426
1322	delete $self->{texture};
1323	$self->update;	1427	$self->update;
1324	$self->check_size;	1428	$self->check_size;
1325	}	1429	}
1326		1430
1327	sub set_markup {	1431	sub set_markup {
1328	my ($self, $markup) = @_;	1432	my ($self, $markup) = @_;
1329		1433
1330	return if $self->{text} eq "M$markup";	1434	return if $self->{text} eq "M$markup";
1331	$self->{text} = "M$markup";	1435	$self->{text} = "M$markup";
1332		1436
		1437	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1438
		1439	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333	$self->{layout}->set_markup ($markup);	1440	$self->{layout}->set_markup ($markup);
1334		1441
1335	delete $self->{texture};
1336	$self->update;	1442	$self->update;
1337	$self->check_size;	1443	$self->check_size;
1338	}	1444	}
1339		1445
1340	sub size_request {	1446	sub size_request {
1341	my ($self) = @_;	1447	my ($self) = @_;
1342		1448
1343	$self->{layout}->set_font ($self->{font}) if $self->{font};	1449	$self->{layout}->set_font ($self->{font}) if $self->{font};
1344	$self->{layout}->set_width ($self->{max_w} || -1);	1450	$self->{layout}->set_width ($self->{max_w} || -1);
		1451	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1452	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1453	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346		1454
1347	my ($w, $h) = $self->{layout}->size;	1455	my ($w, $h) = $self->{layout}->size;
1348		1456
1349	if (exists $self->{template}) {	1457	if (exists $self->{template}) {
…		…
1371	sub set_fontsize {	1479	sub set_fontsize {
1372	my ($self, $fontsize) = @_;	1480	my ($self, $fontsize) = @_;
1373		1481
1374	$self->{fontsize} = $fontsize;	1482	$self->{fontsize} = $fontsize;
1375	delete $self->{texture};	1483	delete $self->{texture};
		1484
		1485	$self->update;
1376	$self->check_size;	1486	$self->check_size;
1377	$self->update;
1378	}	1487	}
1379		1488
1380	sub _draw {	1489	sub _draw {
1381	my ($self) = @_;	1490	my ($self) = @_;
1382		1491
		1492	$self->SUPER::_draw; # draw background, if applicable
		1493
1383	my $tex = $self->{texture} ||= do {	1494	my $tex = $self->{texture} ||= do {
		1495	$self->{layout}->set_foreground (@{$self->{fg}});
1384	$self->{layout}->set_font ($self->{font}) if $self->{font};	1496	$self->{layout}->set_font ($self->{font}) if $self->{font};
1385	$self->{layout}->set_width ($self->{w});	1497	$self->{layout}->set_width ($self->{w});
		1498	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1501
1387	new_from_layout CFClient::Texture $self->{layout}	1502	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1503
		1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1506	: ($self->{w} - $tex->{w}) * 0.5);
		1507
		1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1510	: ($self->{h} - $tex->{h}) * 0.5);
		1511
		1512	$tex
1388	};	1513	};
1389		1514
1390	glEnable GL_BLEND;
1391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392	glEnable GL_TEXTURE_2D;	1515	glEnable GL_TEXTURE_2D;
1393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1516	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394		1517
		1518	if ($tex->{format} == GL_ALPHA) {
1395	glColor @{$self->{fg}};	1519	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});	1520	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1521	} else {
		1522	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1523	}
1410		1524
1411	glDisable GL_TEXTURE_2D;	1525	glDisable GL_TEXTURE_2D;
1412	glDisable GL_BLEND;
1413	}	1526	}
1414		1527
1415	#############################################################################	1528	#############################################################################
1416		1529
1417	package CFClient::UI::EntryBase;	1530	package CFClient::UI::EntryBase;
…		…
1430	active_fg => [0, 0, 0],	1543	active_fg => [0, 0, 0],
1431	can_hover => 1,	1544	can_hover => 1,
1432	can_focus => 1,	1545	can_focus => 1,
1433	valign => 0,	1546	valign => 0,
1434	can_events => 1,	1547	can_events => 1,
		1548	#text => ...
1435	@_	1549	@_
1436	)	1550	)
1437	}	1551	}
1438		1552
1439	sub _set_text {	1553	sub _set_text {
…		…
1449	$self->{text} = $text;	1563	$self->{text} = $text;
1450		1564
1451	$text =~ s/./*/g if $self->{hidden};	1565	$text =~ s/./*/g if $self->{hidden};
1452	$self->{layout}->set_text ("$text ");	1566	$self->{layout}->set_text ("$text ");
1453		1567
1454	$self->emit (changed => $self->{text});	1568	$self->_emit (changed => $self->{text});
1455	}
1456
1457	sub get_text {
1458	$_[0]{text}
1459	}
1460
1461	sub size_request {
1462	my ($self) = @_;
1463
1464	my ($w, $h) = $self->SUPER::size_request;
1465
1466	($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	}	1569	}
1474		1570
1475	sub set_text {	1571	sub set_text {
1476	my ($self, $text) = @_;	1572	my ($self, $text) = @_;
1477		1573
1478	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1479	$self->_set_text ($text);	1575	$self->_set_text ($text);
1480	$self->update;	1576	$self->update;
		1577	$self->check_size;
		1578	}
		1579
		1580	sub get_text {
		1581	$_[0]{text}
		1582	}
		1583
		1584	sub size_request {
		1585	my ($self) = @_;
		1586
		1587	my ($w, $h) = $self->SUPER::size_request;
		1588
		1589	($w + 1, $h) # add 1 for cursor
1481	}	1590	}
1482		1591
1483	sub key_down {	1592	sub key_down {
1484	my ($self, $ev) = @_;	1593	my ($self, $ev) = @_;
1485		1594
…		…
1487	my $sym = $ev->{sym};	1596	my $sym = $ev->{sym};
1488	my $uni = $ev->{unicode};	1597	my $uni = $ev->{unicode};
1489		1598
1490	my $text = $self->get_text;	1599	my $text = $self->get_text;
1491		1600
1492	if ($sym == 8) {	1601	if ($uni == 8) {
1493	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1602	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494	} elsif ($sym == 127) {	1603	} elsif ($uni == 127) {
1495	substr $text, $self->{cursor}, 1, "";	1604	substr $text, $self->{cursor}, 1, "";
1496	} elsif ($sym == CFClient::SDLK_LEFT) {	1605	} elsif ($sym == CFClient::SDLK_LEFT) {
1497	--$self->{cursor} if $self->{cursor};	1606	--$self->{cursor} if $self->{cursor};
1498	} elsif ($sym == CFClient::SDLK_RIGHT) {	1607	} elsif ($sym == CFClient::SDLK_RIGHT) {
1499	++$self->{cursor} if $self->{cursor} < length $self->{text};	1608	++$self->{cursor} if $self->{cursor} < length $self->{text};
1500	} elsif ($sym == CFClient::SDLK_HOME) {	1609	} elsif ($sym == CFClient::SDLK_HOME) {
1501	$self->{cursor} = 0;	1610	$self->{cursor} = 0;
1502	} elsif ($sym == CFClient::SDLK_END) {	1611	} elsif ($sym == CFClient::SDLK_END) {
1503	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1504	} elsif ($sym == 27) {	1613	} elsif ($uni == 27) {
1505	$self->emit ('escape');	1614	$self->_emit ('escape');
1506	} elsif ($uni) {	1615	} elsif ($uni) {
1507	substr $text, $self->{cursor}++, 0, chr $uni;	1616	substr $text, $self->{cursor}++, 0, chr $uni;
1508	}	1617	}
1509		1618
1510	$self->_set_text ($text);	1619	$self->_set_text ($text);
1511	$self->update;	1620	$self->update;
		1621	$self->check_size;
1512	}	1622	}
1513		1623
1514	sub focus_in {	1624	sub focus_in {
1515	my ($self) = @_;	1625	my ($self) = @_;
1516		1626
…		…
1596	if ($sym == 13) {	1706	if ($sym == 13) {
1597	unshift @{$self->{history}},	1707	unshift @{$self->{history}},
1598	my $txt = $self->get_text;	1708	my $txt = $self->get_text;
1599	$self->{history_pointer} = -1;	1709	$self->{history_pointer} = -1;
1600	$self->{history_saveback} = '';	1710	$self->{history_saveback} = '';
1601	$self->emit (activate => $txt);	1711	$self->_emit (activate => $txt);
1602	$self->update;	1712	$self->update;
1603		1713
1604	} elsif ($sym == CFClient::SDLK_UP) {	1714	} elsif ($sym == CFClient::SDLK_UP) {
1605	if ($self->{history_pointer} < 0) {	1715	if ($self->{history_pointer} < 0) {
1606	$self->{history_saveback} = $self->get_text;	1716	$self->{history_saveback} = $self->get_text;
…		…
1645	my $class = shift;	1755	my $class = shift;
1646		1756
1647	$class->SUPER::new (	1757	$class->SUPER::new (
1648	padding => 4,	1758	padding => 4,
1649	fg => [1, 1, 1],	1759	fg => [1, 1, 1],
1650	bg => [1, 1, 1, 0.2],
1651	active_fg => [0, 0, 1],	1760	active_fg => [0, 0, 1],
1652	can_hover => 1,	1761	can_hover => 1,
1653	align => 0,	1762	align => 0,
1654	valign => 0,	1763	valign => 0,
1655	can_events => 1,	1764	can_events => 1,
1656	@_	1765	@_
1657	)	1766	)
1658	}	1767	}
1659		1768
		1769	sub activate { }
		1770
1660	sub button_up {	1771	sub button_up {
1661	my ($self, $ev, $x, $y) = @_;	1772	my ($self, $ev, $x, $y) = @_;
1662		1773
		1774	$self->emit ("activate")
1663	if ($x >= 0 && $x < $self->{w}	1775	if $x >= 0 && $x < $self->{w}
1664	&& $y >= 0 && $y < $self->{h}) {	1776	&& $y >= 0 && $y < $self->{h};
1665	$self->emit ("activate");
1666	}
1667	}	1777	}
1668		1778
1669	sub _draw {	1779	sub _draw {
1670	my ($self) = @_;	1780	my ($self) = @_;
1671		1781
…		…
1673		1783
1674	if ($GRAB == $self) {	1784	if ($GRAB == $self) {
1675	$self->{fg} = $self->{active_fg};	1785	$self->{fg} = $self->{active_fg};
1676	}	1786	}
1677		1787
1678	glEnable GL_BLEND;
1679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680	glEnable GL_TEXTURE_2D;	1788	glEnable GL_TEXTURE_2D;
1681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1789	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682	glColor 0, 0, 0, 1;	1790	glColor 0, 0, 0, 1;
1683		1791
1684	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1792	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685		1793
1686	glDisable GL_TEXTURE_2D;	1794	glDisable GL_TEXTURE_2D;
1687	glDisable GL_BLEND;
1688		1795
1689	$self->SUPER::_draw;	1796	$self->SUPER::_draw;
1690	}	1797	}
1691		1798
1692	#############################################################################	1799	#############################################################################
…		…
1706		1813
1707	$class->SUPER::new (	1814	$class->SUPER::new (
1708	padding => 2,	1815	padding => 2,
1709	fg => [1, 1, 1],	1816	fg => [1, 1, 1],
1710	active_fg => [1, 1, 0],	1817	active_fg => [1, 1, 0],
		1818	bg => [0, 0, 0, 0.2],
		1819	active_bg => [1, 1, 1, 0.5],
1711	state => 0,	1820	state => 0,
1712	can_hover => 1,	1821	can_hover => 1,
1713	@_	1822	@_
1714	)	1823	)
1715	}	1824	}
…		…
1724	my ($self, $ev, $x, $y) = @_;	1833	my ($self, $ev, $x, $y) = @_;
1725		1834
1726	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728	$self->{state} = !$self->{state};	1837	$self->{state} = !$self->{state};
1729	$self->emit (changed => $self->{state});	1838	$self->_emit (changed => $self->{state});
1730	}	1839	}
1731	}	1840	}
1732		1841
1733	sub _draw {	1842	sub _draw {
1734	my ($self) = @_;	1843	my ($self) = @_;
…		…
1739		1848
1740	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1849	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741		1850
1742	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1851	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743		1852
1744	glEnable GL_BLEND;	1853	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1854
1745	glEnable GL_TEXTURE_2D;	1855	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);	1856	$tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752	glDisable GL_TEXTURE_2D;	1857	glDisable GL_TEXTURE_2D;
1753	glDisable GL_BLEND;
1754	}	1858	}
1755		1859
1756	#############################################################################	1860	#############################################################################
1757		1861
1758	package CFClient::UI::Image;	1862	package CFClient::UI::Image;
…		…
1801	glTranslate 0, -$self->{w}, 0;	1905	glTranslate 0, -$self->{w}, 0;
1802		1906
1803	($w, $h) = ($h, $w);	1907	($w, $h) = ($h, $w);
1804	}	1908	}
1805		1909
1806	glEnable GL_BLEND;
1807	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808	glEnable GL_TEXTURE_2D;	1910	glEnable GL_TEXTURE_2D;
1809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1911	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810		1912
1811	$tex->draw_quad (0, 0, $w, $h);	1913	$tex->draw_quad_alpha (0, 0, $w, $h);
1812		1914
1813	glDisable GL_BLEND;
1814	glDisable GL_TEXTURE_2D;	1915	glDisable GL_TEXTURE_2D;
1815	}	1916	}
1816		1917
1817	#############################################################################	1918	#############################################################################
1818		1919
…		…
2007	qw(s1_slider.png s1_slider_bg.png);	2108	qw(s1_slider.png s1_slider_bg.png);
2008		2109
2009	sub new {	2110	sub new {
2010	my $class = shift;	2111	my $class = shift;
2011		2112
2012	# range [value, low, high, page]	2113	# range [value, low, high, page, unit]
2013		2114
2014	# TODO: 0-width page	2115	# TODO: 0-width page
2015	# TODO: req_w/h are wrong with vertical	2116	# TODO: req_w/h are wrong with vertical
2016	# TODO: calculations are off	2117	# TODO: calculations are off
2017	my $self = $class->SUPER::new (	2118	my $self = $class->SUPER::new (
2018	fg => [1, 1, 1],	2119	fg => [1, 1, 1],
2019	active_fg => [0, 0, 0],	2120	active_fg => [0, 0, 0],
		2121	bg => [0, 0, 0, 0.2],
		2122	active_bg => [1, 1, 1, 0.5],
2020	range => [0, 0, 100, 10],	2123	range => [0, 0, 100, 10, 0],
2021	req_w => $::WIDTH / 80,	2124	req_w => $::WIDTH / 80,
2022	req_h => $::WIDTH / 80,	2125	req_h => $::WIDTH / 80,
2023	vertical => 0,	2126	vertical => 0,
2024	can_hover => 1,	2127	can_hover => 1,
2025	inner_pad => 5,	2128	inner_pad => 0.02,
2026	@_	2129	@_
2027	);	2130	);
2028		2131
		2132	$self->set_value ($self->{range}[0]);
		2133	$self->update;
		2134
2029	$self	2135	$self
		2136	}
		2137
		2138	sub set_range {
		2139	my ($self, $range) = @_;
		2140
		2141	$self->{range} = $range;
		2142
		2143	$self->update;
		2144	}
		2145
		2146	sub set_value {
		2147	my ($self, $value) = @_;
		2148
		2149	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2150
		2151	$hi = $lo + 1 if $hi <= $lo;
		2152
		2153	$page = $hi - $lo if $page > $hi - $lo;
		2154
		2155	$value = $lo if $value < $lo;
		2156	$value = $hi - $page if $value > $hi - $page;
		2157
		2158	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2159	if $unit;
		2160
		2161	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2162
		2163	if ($value != $old_value) {
		2164	$self->_emit (changed => $value);
		2165	$self->update;
		2166	}
2030	}	2167	}
2031		2168
2032	sub size_request {	2169	sub size_request {
2033	my ($self) = @_;	2170	my ($self) = @_;
2034		2171
…		…
2040		2177
2041	sub button_down {	2178	sub button_down {
2042	my ($self, $ev, $x, $y) = @_;	2179	my ($self, $ev, $x, $y) = @_;
2043		2180
2044	$self->SUPER::button_down ($ev, $x, $y);	2181	$self->SUPER::button_down ($ev, $x, $y);
		2182
		2183	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2184
2045	$self->mouse_motion ($ev, $x, $y);	2185	$self->mouse_motion ($ev, $x, $y);
2046	}	2186	}
2047		2187
2048	sub mouse_motion {	2188	sub mouse_motion {
2049	my ($self, $ev, $x, $y) = @_;	2189	my ($self, $ev, $x, $y) = @_;
2050		2190
2051	if ($GRAB == $self) {	2191	if ($GRAB == $self) {
		2192	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2193
		2194	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2195
		2196	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2197
		2198	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2199	}
		2200	}
		2201
		2202	sub update {
		2203	my ($self) = @_;
		2204
		2205	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2206	$self->set_value ($self->{range}[0]);
		2207
2052	my ($value, $lo, $hi, $page) = @{$self->{range}};	2208	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2209	my $range = ($hi - $page - $lo) || 1e-100;
2053		2210
2054	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2211	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055		2212
2056	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2213	$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	2214	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058		2215
2059	$x -= $inner_pad_px; # substract the padding	2216	$value = ($value - $lo) / $range;
2060	$x = $x * ($hi - $lo) / $inner_w + $lo;	2217	$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		2218
2065	$self->emit (changed => $x);	2219	$self->{knob_x} = $value - $knob_w * 0.5;
2066	$self->update;	2220	$self->{knob_w} = $knob_w;
2067	}	2221	});
2068	}
2069		2222
2070	# the inner_* stuff is for generating a padding for the slider handle,	2223	$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	}	2224	}
2077		2225
2078	sub _draw {	2226	sub _draw {
2079	my ($self) = @_;	2227	my ($self) = @_;
2080		2228
2081	$self->SUPER::_draw ();	2229	$self->SUPER::_draw ();
2082		2230
2083	my ($w, $h) = @$self{qw(w h)};	2231	glScale $self->{w}, $self->{h};
2084		2232
2085	if ($self->{vertical}) {	2233	if ($self->{vertical}) {
2086	# draw a vertical slider like a rotated horizontal slider	2234	# draw a vertical slider like a rotated horizontal slider
2087		2235
		2236	glTranslate 1, 0, 0;
2088	glRotate 90, 0, 0, 1;	2237	glRotate 90, 0, 0, 1;
2089	glTranslate 0, -$self->{w}, 0;
2090
2091	($w, $h) = ($h, $w);
2092	}	2238	}
2093		2239
2094	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2240	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2241	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096		2242
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;	2243	glEnable GL_TEXTURE_2D;
2118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119		2245
2120	# draw background	2246	# draw background
2121	$tex[1]->draw_quad (0, 0, $w, $h);	2247	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122		2248
2123	# draw handle	2249	# draw handle
2124	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2250	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125		2251
2126	glDisable GL_BLEND;
2127	glDisable GL_TEXTURE_2D;	2252	glDisable GL_TEXTURE_2D;
2128	}	2253	}
		2254
		2255	#############################################################################
		2256
		2257	package CFClient::UI::ValSlider;
		2258
		2259	our @ISA = CFClient::UI::HBox::;
		2260
		2261	sub new {
		2262	my ($class, %arg) = @_;
		2263
		2264	my $range = delete $arg{range};
		2265
		2266	my $self = $class->SUPER::new (
		2267	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2268	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2269	to_value => sub { shift },
		2270	from_value => sub { shift },
		2271	%arg,
		2272	);
		2273
		2274	$self->{slider}->connect (changed => sub {
		2275	my ($self, $value) = @_;
		2276	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2277	$self->{parent}->emit (changed => $value);
		2278	});
		2279
		2280	# $self->{entry}->connect (changed => sub {
		2281	# my ($self, $value) = @_;
		2282	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2283	# $self->{parent}->emit (changed => $value);
		2284	# });
		2285
		2286	$self->add ($self->{slider}, $self->{entry});
		2287
		2288	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2289
		2290	$self
		2291	}
		2292
		2293	sub set_range { shift->{slider}->set_range (@_) }
		2294	sub set_value { shift->{slider}->set_value (@_) }
2129		2295
2130	#############################################################################	2296	#############################################################################
2131		2297
2132	package CFClient::UI::TextView;	2298	package CFClient::UI::TextView;
2133		2299
…		…
2142	fontsize => 1,	2308	fontsize => 1,
2143	can_events => 0,	2309	can_events => 0,
2144	#font => default_font	2310	#font => default_font
2145	@_,	2311	@_,
2146		2312
2147	layout => (new CFClient::Layout),	2313	layout => (new CFClient::Layout 1),
2148	par => [],	2314	par => [],
2149	height => 0,	2315	height => 0,
2150	children => [	2316	children => [
2151	(new CFClient::UI::Empty expand => 1),	2317	(new CFClient::UI::Empty expand => 1),
2152	(new CFClient::UI::Slider vertical => 1),	2318	(new CFClient::UI::Slider vertical => 1),
…		…
2163		2329
2164	$self->{fontsize} = $fontsize;	2330	$self->{fontsize} = $fontsize;
2165	$self->reflow;	2331	$self->reflow;
2166	}	2332	}
2167		2333
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 {	2334	sub size_allocate {
2188	my ($self, $w, $h) = @_;	2335	my ($self, $w, $h) = @_;
2189		2336
2190	$self->SUPER::size_allocate ($w, $h);	2337	$self->SUPER::size_allocate ($w, $h);
2191		2338
…		…
2194	$self->{layout}->set_width ($self->{children}[0]{w});	2341	$self->{layout}->set_width ($self->{children}[0]{w});
2195		2342
2196	$self->reflow;	2343	$self->reflow;
2197	}	2344	}
2198		2345
		2346	sub text_size {
		2347	my ($self, $text, $indent) = @_;
		2348
		2349	my $layout = $self->{layout};
		2350
		2351	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2352	$layout->set_width ($self->{children}[0]{w} - $indent);
		2353	$layout->set_markup ($text);
		2354
		2355	$layout->size
		2356	}
		2357
		2358	sub reflow {
		2359	my ($self) = @_;
		2360
		2361	$self->{need_reflow}++;
		2362	$self->update;
		2363	}
		2364
		2365	sub set_offset {
		2366	my ($self, $offset) = @_;
		2367
		2368	# todo: base offset on lines or so, not on pixels
		2369	$self->{children}[1]->set_value ($offset);
		2370	}
		2371
		2372	sub clear {
		2373	my ($self) = @_;
		2374
		2375	$self->{par} = [];
		2376	$self->{height} = 0;
		2377	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2378	}
		2379
2199	sub add_paragraph {	2380	sub add_paragraph {
2200	my ($self, $color, $text) = @_;	2381	my ($self, $color, $text, $indent) = @_;
2201		2382
2202	#TODO: intelligently "reformat" paragraph	2383	for my $line (split /\n/, $text) {
2203		2384	my ($w, $h) = $self->text_size ($line);
2204	my $height = $self->text_height ($text);
2205
2206	$self->{height} += $height;	2385	$self->{height} += $h;
		2386	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2387	}
2207		2388
2208	push @{$self->{par}}, [$height, $color, $text];
2209
2210	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2389	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211	$self->{children}[1]->update;
2212	}	2390	}
2213		2391
2214	sub update {	2392	sub update {
2215	my ($self) = @_;	2393	my ($self) = @_;
2216		2394
…		…
2218		2396
2219	return unless $self->{h} > 0;	2397	return unless $self->{h} > 0;
2220		2398
2221	delete $self->{texture};	2399	delete $self->{texture};
2222		2400
2223	$ROOT->on_refresh ($self, sub {	2401	$ROOT->on_post_alloc ($self, sub {
		2402	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2403
2224	if (delete $self->{need_reflow}) {	2404	if (delete $self->{need_reflow}) {
2225	my $height = 0;	2405	my $height = 0;
2226		2406
2227	$height += $_->[0] = $self->text_height ($_->[2])	2407	my $layout = $self->{layout};
		2408
		2409	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2410
2228	for @{$self->{par}};	2411	for (@{$self->{par}}) {
		2412	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2413	$layout->set_width ($W - $_->[3]);
		2414	$layout->set_markup ($_->[4]);
		2415	my ($w, $h) = $layout->size;
		2416	$_->[0] = $w + $_->[3];
		2417	$_->[1] = $h;
		2418	}
		2419
		2420	$height += $_->[1];
		2421	}
2229		2422
2230	$self->{height} = $height;	2423	$self->{height} = $height;
2231		2424
2232	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2425	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233		2426
2234	delete $self->{texture};	2427	delete $self->{texture};
2235	}	2428	}
2236		2429
2237	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2430	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238	glClearColor 0, 0, 0, 0;	2431	glClearColor 0.5, 0.5, 0.5, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2432	glClear GL_COLOR_BUFFER_BIT;
2240		2433
		2434	my $top = int $self->{children}[1]{range}[0];
		2435
		2436	my $y0 = $top;
		2437	my $y1 = $top + $H;
		2438
		2439	my $y = 0;
		2440
		2441	my $layout = $self->{layout};
		2442
		2443	$layout->set_font ($self->{font}) if $self->{font};
		2444
2241	glEnable GL_BLEND;	2445	glEnable GL_BLEND;
		2446	#TODO# not correct in windows where rgba is forced off
2242	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2447	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		2448
2257	for my $par (@{$self->{par}}) {	2449	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2450	my $h = $par->[1];
2259		2451
2260	if ($y0 < $y + $h && $y < $y1) {	2452	if ($y0 < $y + $h && $y < $y1) {
		2453	$layout->set_foreground (@{ $par->[2] });
		2454	$layout->set_width ($W - $par->[3]);
2261	$layout->set_text ($par->[2]);	2455	$layout->set_markup ($par->[4]);
2262		2456
2263	glColor @{ $par->[1] };	2457	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	my ($W, $H) = $layout->size;	2458
2265	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2459	glRasterPos $par->[3], $y - $y0;
		2460	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266	}	2461	}
2267		2462
2268	$y += $h;	2463	$y += $h;
2269	}	2464	}
2270		2465
2271	glDisable GL_TEXTURE_2D;
2272	glDisable GL_BLEND;	2466	glDisable GL_BLEND;
2273	};	2467	};
2274	});	2468	});
2275	}	2469	}
2276		2470
2277	sub _draw {	2471	sub _draw {
2278	my ($self) = @_;	2472	my ($self) = @_;
2279		2473
2280	glEnable GL_BLEND;
2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282	glEnable GL_TEXTURE_2D;	2474	glEnable GL_TEXTURE_2D;
2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2475	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284	glColor 1, 1, 1, 1;	2476	glColor 1, 1, 1, 1;
2285	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2477	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286	glDisable GL_TEXTURE_2D;	2478	glDisable GL_TEXTURE_2D;
2287	glDisable GL_BLEND;
2288		2479
2289	$self->{children}[1]->draw;	2480	$self->{children}[1]->draw;
2290		2481
2291	}	2482	}
2292		2483
…		…
2360		2551
2361	# TODO: use animation	2552	# TODO: use animation
2362	if ($self->{state} = !$self->{state}) {	2553	if ($self->{state} = !$self->{state}) {
2363	$CFClient::UI::ROOT->add ($self->{other});	2554	$CFClient::UI::ROOT->add ($self->{other});
2364	$self->{other}->move ($self->coord2global (0, $self->{h}));	2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2365	$self->emit ("open");	2556	$self->_emit ("open");
2366	} else {	2557	} else {
2367	$CFClient::UI::ROOT->remove ($self->{other});	2558	$CFClient::UI::ROOT->remove ($self->{other});
2368	$self->emit ("close");	2559	$self->_emit ("close");
2369	}	2560	}
2370		2561
2371	$self->emit (changed => $self->{state});	2562	$self->_emit (changed => $self->{state});
2372	}	2563	}
2373		2564
2374	#############################################################################	2565	#############################################################################
2375		2566
2376	package CFClient::UI::Tooltip;	2567	package CFClient::UI::Tooltip;
…		…
2386	@_,	2577	@_,
2387	can_events => 0,	2578	can_events => 0,
2388	)	2579	)
2389	}	2580	}
2390		2581
2391	sub set_markup {	2582	sub set_tooltip_from {
2392	my ($self, $text) = @_;	2583	my ($self, $widget) = @_;
2393		2584
2394	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2585	$self->add (new CFClient::UI::Label
2395	$self->{label}->set_markup ($text);	2586	markup => $widget->{tooltip},
2396	$self->add ($self->{label});	2587	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2588	fontsize => 0.8,
		2589	fg => [0, 0, 0, 1],
		2590	ellipsise => 0,
		2591	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2592	);
2397	}	2593	}
2398		2594
2399	sub size_request {	2595	sub size_request {
2400	my ($self) = @_;	2596	my ($self) = @_;
2401
2402	$self->child->set_max_size ($::WIDTH * 0.3);
2403		2597
2404	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2598	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405		2599
2406	($w + 4, $h + 4)	2600	($w + 4, $h + 4)
2407	}	2601	}
…		…
2413	}	2607	}
2414		2608
2415	sub _draw {	2609	sub _draw {
2416	my ($self) = @_;	2610	my ($self) = @_;
2417		2611
2418	glPushMatrix;
2419	glTranslate 0.375, 0.375;	2612	glTranslate 0.375, 0.375;
2420		2613
2421	my ($w, $h) = @$self{qw(w h)};	2614	my ($w, $h) = @$self{qw(w h)};
2422		2615
2423	glColor 1, 0.8, 0.4;	2616	glColor 1, 0.8, 0.4;
…		…
2434	glVertex 0 , $h;	2627	glVertex 0 , $h;
2435	glVertex $w, $h;	2628	glVertex $w, $h;
2436	glVertex $w, 0;	2629	glVertex $w, 0;
2437	glEnd;	2630	glEnd;
2438		2631
2439	glPopMatrix;	2632	glTranslate 2 - 0.375, 2 - 0.375;
2440
2441	glTranslate 2, 2;
2442	$self->SUPER::_draw;	2633	$self->SUPER::_draw;
2443	}	2634	}
2444		2635
2445	#############################################################################	2636	#############################################################################
2446		2637
…		…
2451	use CFClient::OpenGL;	2642	use CFClient::OpenGL;
2452		2643
2453	sub new {	2644	sub new {
2454	my $class = shift;	2645	my $class = shift;
2455		2646
2456	$class->SUPER::new (	2647	my $self = $class->SUPER::new (
2457	aspect => 1,	2648	aspect => 1,
		2649	can_events => 0,
2458	@_,	2650	@_,
2459	)	2651	);
		2652
		2653	if ($self->{anim} && $self->{animspeed}) {
		2654	Scalar::Util::weaken (my $widget = $self);
		2655
		2656	$self->{timer} = Event->timer (
		2657	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2658	hard => 1,
		2659	interval => $self->{animspeed},
		2660	cb => sub {
		2661	++$widget->{frame};
		2662	$widget->update;
		2663	},
		2664	);
		2665	}
		2666
		2667	$self
2460	}	2668	}
2461		2669
2462	sub size_request {	2670	sub size_request {
2463	(32, 8)	2671	(32, 8)
2464	}	2672	}
2465		2673
		2674	sub update {
		2675	my ($self) = @_;
		2676
		2677	return unless $self->{visible};
		2678
		2679	$self->SUPER::update;
		2680	}
		2681
2466	sub _draw {	2682	sub _draw {
2467	my ($self) = @_;	2683	my ($self) = @_;
2468		2684
		2685	return unless $::CONN;
		2686
		2687	my $face;
		2688
		2689	if ($self->{frame}) {
		2690	my $anim = $::CONN->{anim}[$self->{anim}];
		2691
		2692	$face = $anim->[ $self->{frame} % @$anim ]
		2693	if $anim && @$anim;
		2694	}
		2695
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2696	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2697
2471	# TODO animation
2472	if ($tex) {	2698	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2699	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2701	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2702	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2704	}
		2705	}
		2706
		2707	sub DESTROY {
		2708	my ($self) = @_;
		2709
		2710	$self->{timer}->cancel
		2711	if $self->{timer};
		2712
		2713	$self->SUPER::DESTROY;
		2714	}
		2715
		2716	#############################################################################
		2717
		2718	package CFClient::UI::Inventory;
		2719
		2720	our @ISA = CFClient::UI::ScrolledWindow::;
		2721
		2722	sub new {
		2723	my $class = shift;
		2724
		2725	my $self = $class->SUPER::new (
		2726	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2727	@_,
		2728	);
		2729
		2730	$self
		2731	}
		2732
		2733	sub set_items {
		2734	my ($self, $items) = @_;
		2735
		2736	$self->{scrolled}->clear;
		2737	return unless $items;
		2738
		2739	my @items = sort {
		2740	($a->{type} <=> $b->{type})
		2741	or ($a->{name} cmp $b->{name})
		2742	} @$items;
		2743
		2744	$self->{real_items} = \@items;
		2745
		2746	my $row = 0;
		2747	for my $item (@items) {
		2748	CFClient::Item::update_widgets $item;
		2749
		2750	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2753
		2754	$row++;
		2755	}
		2756
		2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2758	}
		2759
		2760	sub size_request {
		2761	my ($self) = @_;
		2762	($self->{req_w}, $self->{req_h});
2482	}	2763	}
2483		2764
2484	#############################################################################	2765	#############################################################################
2485		2766
2486	package CFClient::UI::Menu;	2767	package CFClient::UI::Menu;
…		…
2521		2802
2522	# popup given the event (must be a mouse button down event currently)	2803	# popup given the event (must be a mouse button down event currently)
2523	sub popup {	2804	sub popup {
2524	my ($self, $ev) = @_;	2805	my ($self, $ev) = @_;
2525		2806
2526	$self->emit ("popdown");	2807	$self->_emit ("popdown");
2527		2808
2528	# maybe save $GRAB? must be careful about events...	2809	# maybe save $GRAB? must be careful about events...
2529	$GRAB = $self;	2810	$GRAB = $self;
2530	$self->{button} = $ev->{button};	2811	$self->{button} = $ev->{button};
2531		2812
…		…
2546		2827
2547	if ($ev->{button} == $self->{button}) {	2828	if ($ev->{button} == $self->{button}) {
2548	undef $GRAB;	2829	undef $GRAB;
2549	$self->hide;	2830	$self->hide;
2550		2831
2551	$self->emit ("popdown");	2832	$self->_emit ("popdown");
2552	$self->{hover}[1]->() if $self->{hover};	2833	$self->{hover}[1]->() if $self->{hover};
2553	}	2834	}
2554	}	2835	}
2555		2836
2556	#############################################################################	2837	#############################################################################
2557		2838
		2839	package CFClient::UI::Statusbox;
		2840
		2841	our @ISA = CFClient::UI::VBox::;
		2842
		2843	sub new {
		2844	my $class = shift;
		2845
		2846	$class->SUPER::new (
		2847	fontsize => 0.8,
		2848	@_,
		2849	)
		2850	}
		2851
		2852	sub reorder {
		2853	my ($self) = @_;
		2854	my $NOW = time;
		2855
		2856	while (my ($k, $v) = each %{ $self->{item} }) {
		2857	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2858	}
		2859
		2860	my @widgets;
		2861
		2862	my @items = sort {
		2863	$a->{pri} <=> $b->{pri}
		2864	or $b->{id} <=> $a->{id}
		2865	} values %{ $self->{item} };
		2866
		2867	my $count = 10 + 1;
		2868	for my $item (@items) {
		2869	last unless --$count;
		2870
		2871	push @widgets, $item->{label} ||= do {
		2872	# TODO: doesn't handle markup well (read as: at all)
		2873	my $short = $item->{count} > 1
		2874	? "<b>$item->{count} ×</b> $item->{text}"
		2875	: $item->{text};
		2876
		2877	for ($short) {
		2878	s/^\s+//;
		2879	s/\s+/ /g;
		2880	}
		2881
		2882	new CFClient::UI::Label
		2883	markup => $short,
		2884	tooltip => $item->{tooltip},
		2885	tooltip_font => $::FONT_PROP,
		2886	tooltip_width => 0.67,
		2887	fontsize => $item->{fontsize} || $self->{fontsize},
		2888	max_w => $::WIDTH * 0.44,
		2889	fg => $item->{fg},
		2890	can_events => 1,
		2891	can_hover => 1
		2892	};
		2893	}
		2894
		2895	$self->clear;
		2896	$self->SUPER::add (reverse @widgets);
		2897	}
		2898
		2899	sub add {
		2900	my ($self, $text, %arg) = @_;
		2901
		2902	$text =~ s/^\s+//;
		2903	$text =~ s/\s+$//;
		2904
		2905	return unless $text;
		2906
		2907	my $timeout = time + ((delete $arg{timeout}) || 60);
		2908
		2909	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2910
		2911	if (my $item = $self->{item}{$group}) {
		2912	if ($item->{text} eq $text) {
		2913	$item->{count}++;
		2914	} else {
		2915	$item->{count} = 1;
		2916	$item->{text} = $item->{tooltip} = $text;
		2917	}
		2918	$item->{id} = ++$self->{id};
		2919	$item->{timeout} = $timeout;
		2920	delete $item->{label};
		2921	} else {
		2922	$self->{item}{$group} = {
		2923	id => ++$self->{id},
		2924	text => $text,
		2925	timeout => $timeout,
		2926	tooltip => $text,
		2927	fg => [0.8, 0.8, 0.8, 0.8],
		2928	pri => 0,
		2929	count => 1,
		2930	%arg,
		2931	};
		2932	}
		2933
		2934	$self->reorder;
		2935	}
		2936
		2937	sub reconfigure {
		2938	my ($self) = @_;
		2939
		2940	delete $_->{label}
		2941	for values %{ $self->{item} || {} };
		2942
		2943	$self->reorder;
		2944	$self->SUPER::reconfigure;
		2945	}
		2946
		2947	#############################################################################
		2948
2558	package CFClient::UI::Root;	2949	package CFClient::UI::Root;
2559		2950
2560	our @ISA = CFClient::UI::Container::;	2951	our @ISA = CFClient::UI::Container::;
2561		2952
2562	use CFClient::OpenGL;	2953	use CFClient::OpenGL;
2563		2954
2564	sub check_size {	2955	sub new {
2565	my ($self) = @_;	2956	my $class = shift;
2566		2957
2567	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2958	$class->SUPER::new (
2568	}	2959	@_,
2569		2960	)
2570	sub size_request {
2571	($::WIDTH, $::HEIGHT)
2572	}	2961	}
2573		2962
2574	sub configure {	2963	sub configure {
2575	my ($self, $x, $y, $w, $h) = @_;	2964	my ($self, $x, $y, $w, $h) = @_;
2576		2965
2577	$self->SUPER::configure ($x, $y, $w, $h);	2966	$self->{w} = $w;
		2967	$self->{h} = $h;
		2968	}
2578		2969
		2970	sub check_size {
		2971	my ($self) = @_;
		2972
		2973	$self->size_allocate ($self->{w}, $self->{h})
		2974	if $self->{w};
		2975	}
		2976
		2977	sub size_request {
		2978	my ($self) = @_;
		2979
		2980	($self->{w}, $self->{h})
		2981	}
		2982
		2983	sub size_allocate {
		2984	my ($self, $w, $h) = @_;
		2985
2579	for my $child (@{$self->{children}}) {	2986	for my $child ($self->children) {
2580	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2987	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581		2988
		2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2990	if exists $child->{req_x};
		2991
		2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2993	if exists $child->{req_y};
		2994
2582	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2995	$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;	2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2997
2584	$child->configure ($X, $Y, $W,$H);	2998	$child->configure ($X, $Y, $W, $H);
2585	}	2999	}
2586	}	3000	}
2587		3001
2588	sub _topleft {	3002	sub coord2local {
2589	my ($self, $x, $y) = @_;	3003	my ($self, $x, $y) = @_;
2590		3004
2591	($x, $y)	3005	($x, $y)
2592	}	3006	}
2593		3007
		3008	sub coord2global {
		3009	my ($self, $x, $y) = @_;
		3010
		3011	($x, $y)
		3012	}
		3013
2594	sub update {	3014	sub update {
2595	my ($self) = @_;	3015	my ($self) = @_;
2596		3016
2597	$self->check_size;	3017	$self->check_size;
2598	::refresh ();	3018	$::WANT_REFRESH++;
2599	}	3019	}
2600		3020
2601	sub add {	3021	sub add {
2602	my ($self, $child) = @_;	3022	my ($self, @children) = @_;
2603		3023
		3024	for (my @widgets = @children; my $w = pop @widgets; ) {
		3025	push @widgets, $w->children;
		3026	$w->{root} = $self;
		3027	$w->{visible} = 1;
		3028	}
		3029
		3030	for my $child (@children) {
		3031	$child->{is_toplevel} = 1;
		3032
2604	# integerize window positions	3033	# integerise window positions
2605	$child->{x} = int $child->{x};	3034	$child->{x} = int $child->{x};
2606	$child->{y} = int $child->{y};	3035	$child->{y} = int $child->{y};
		3036	}
2607		3037
2608	$self->SUPER::add ($child);	3038	$self->SUPER::add (@children);
		3039	}
		3040
		3041	sub remove {
		3042	my ($self, @children) = @_;
		3043
		3044	$self->SUPER::remove (@children);
		3045
		3046	while (@children) {
		3047	my $w = pop @children;
		3048	push @children, $w->children;
		3049	$w->set_invisible;
		3050	}
2609	}	3051	}
2610		3052
2611	sub on_refresh {	3053	sub on_refresh {
2612	my ($self, $id, $cb) = @_;	3054	my ($self, $id, $cb) = @_;
2613		3055
2614	$self->{refresh_hook}{$id} = $cb;	3056	$self->{refresh_hook}{$id} = $cb;
2615	}	3057	}
2616		3058
		3059	sub on_post_alloc {
		3060	my ($self, $id, $cb) = @_;
		3061
		3062	$self->{post_alloc_hook}{$id} = $cb;
		3063	}
		3064
2617	sub draw {	3065	sub draw {
2618	my ($self) = @_;	3066	my ($self) = @_;
2619		3067
2620	while (my $rcb = delete $self->{refresh_hook}) {	3068	while ($self->{refresh_hook}) {
2621	$_->() for values %$rcb;	3069	$_->()
		3070	for values %{delete $self->{refresh_hook}};
		3071	}
		3072
		3073	if ($self->{check_size}) {
		3074	my @queue = ([], []);
		3075
		3076	for (;;) {
		3077	if ($self->{check_size}) {
		3078	# heuristic: check containers last
		3079	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3080	for values %{delete $self->{check_size}}
		3081	}
		3082
		3083	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3084
		3085	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3086	? @$widget{qw(user_w user_h)}
		3087	: $widget->size_request;
		3088
		3089	if (delete $widget->{force_alloc}
		3090	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3091	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3092
		3093	$widget->{req_w} = $w;
		3094	$widget->{req_h} = $h;
		3095
		3096	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3097
		3098	$widget->{parent}->check_size
		3099	if $widget->{parent};
		3100	}
		3101	}
		3102	}
		3103
		3104	while ($self->{size_alloc}) {
		3105	for (values %{delete $self->{size_alloc}}) {
		3106	my ($widget, $w, $h) = @$_;
		3107
		3108	$w = 0 if $w < 0;
		3109	$h = 0 if $h < 0;
		3110
		3111	$widget->{w} = $w;
		3112	$widget->{h} = $h;
		3113	$widget->emit (size_allocate => $w, $h);
		3114	}
		3115	}
		3116
		3117	while ($self->{post_alloc_hook}) {
		3118	$_->()
		3119	for values %{delete $self->{post_alloc_hook}};
2622	}	3120	}
2623		3121
2624	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3122	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3123	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626	glClear GL_COLOR_BUFFER_BIT;	3124	glClear GL_COLOR_BUFFER_BIT;
2627		3125
2628	glMatrixMode GL_PROJECTION;	3126	glMatrixMode GL_PROJECTION;
2629	glLoadIdentity;	3127	glLoadIdentity;
2630	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3128	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631	glMatrixMode GL_MODELVIEW;	3129	glMatrixMode GL_MODELVIEW;
2632	glLoadIdentity;	3130	glLoadIdentity;
2633		3131
2634	$self->_draw;	3132	$self->_draw;
2635	}	3133	}
2636		3134
2637	#############################################################################	3135	#############################################################################
2638		3136
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;	3137	package CFClient::UI;
2693		3138
2694	$ROOT = new CFClient::UI::Root;	3139	$ROOT = new CFClient::UI::Root;
2695	$TOOLTIP = new CFClient::UI::Tooltip;	3140	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696		3141
2697	1	3142	1
2698		3143

Diff Legend

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