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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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
…		…
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
		17	our %WIDGET; # all widgets, weak-referenced
		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 (exists $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
20		23
21	if ($TOOLTIP->{owner} != $widget) {	24	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	25	$TOOLTIP->{owner} = $widget;
		26
		27	my $tip = $widget->{tooltip};
		28
		29	$tip = $tip->($widget) if CODE:: eq ref $tip;
		30
23	$TOOLTIP->set_text ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
24	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
26	}	42	}
27		43
28	return;	44	return;
29	}	45	}
30	}	46	}
…		…
34	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
35	}	51	}
36		52
37	# class methods for events	53	# class methods for events
38	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
39	$FOCUS->key_down ($_[0]) if $FOCUS;	55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		56	if $FOCUS;
40	}	57	}
41		58
42	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
43	$FOCUS->key_up ($_[0]) if $FOCUS;	60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		61	if $FOCUS;
44	}	62	}
45		63
46	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
47	my ($ev) = @_;	65	my ($ev) = @_;
48	my ($x, $y) = ($ev->{x}, $ev->{y});	66	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
56	check_tooltip;	74	check_tooltip;
57	}	75	}
58		76
59	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
60		78
61	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	79	if ($GRAB) {
		80	($x, $y) = $GRAB->coord2local ($x, $y);
		81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		82	}
62	}	83	}
63		84
64	sub feed_sdl_button_up_event {	85	sub feed_sdl_button_up_event {
65	my ($ev) = @_;	86	my ($ev) = @_;
66	my ($x, $y) = ($ev->{x}, $ev->{y});	87	my ($x, $y) = ($ev->{x}, $ev->{y});
67		88
68	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69		90
70	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71		92
72	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	93	if ($GRAB) {
		94	($x, $y) = $GRAB->coord2local ($x, $y);
		95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		96	}
73		97
74	if (!$BUTTON_STATE) {	98	if (!$BUTTON_STATE) {
75	my $grab = $GRAB; undef $GRAB;	99	my $grab = $GRAB; undef $GRAB;
76	$grab->update if $grab;	100	$grab->update if $grab;
77	$GRAB->update if $GRAB;	101	$GRAB->update if $GRAB;
…		…
93	$HOVER->update if $HOVER && $HOVER->{can_hover};	117	$HOVER->update if $HOVER && $HOVER->{can_hover};
94		118
95	check_tooltip;	119	check_tooltip;
96	}	120	}
97		121
98	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	122	if ($HOVER) {
		123	($x, $y) = $HOVER->coord2local ($x, $y);
		124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		125	}
99	}	126	}
100		127
101	# convert position array to integers	128	# convert position array to integers
102	sub harmonize {	129	sub harmonize {
103	my ($vals) = @_;	130	my ($vals) = @_;
…		…
109	$rem += $_ - $i;	136	$rem += $_ - $i;
110	$_ = $i;	137	$_ = $i;
111	}	138	}
112	}	139	}
113		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	for my $widget (values %WIDGET) {
		146	if ($widget->{toplevel}) {
		147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		155	}
		156
		157	$widget->reconfigure;
		158	}
		159	}
		160
114	#############################################################################	161	#############################################################################
115		162
116	package CFClient::UI::Base;	163	package CFClient::UI::Base;
117		164
118	use strict;	165	use strict;
…		…
121		168
122	sub new {	169	sub new {
123	my $class = shift;	170	my $class = shift;
124		171
125	my $self = bless {	172	my $self = bless {
126	x => 0,	173	x => 0,
127	y => 0,	174	y => 0,
128	z => 0,	175	z => 0,
129	can_events => 1,	176	can_events => 1,
130	@_	177	@_
131	}, $class;	178	}, $class;
132		179
133	for (keys %$self) {	180	for (keys %$self) {
134	if (/^connect_(.*)$/) {	181	if (/^connect_(.*)$/) {
135	$self->connect ($1 => delete $self->{$_});	182	$self->connect ($1 => delete $self->{$_});
136	}	183	}
137	}	184	}
138		185
		186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		187
139	$self	188	$self
140	}	189	}
141		190
		191	sub destroy {
		192	my ($self) = @_;
		193
		194	$self->hide;
		195	%$self = ();
		196	}
		197
142	sub show {	198	sub show {
143	my ($self) = @_;	199	my ($self) = @_;
144		200
145	return if $self->{parent};	201	return if $self->{parent};
146		202
…		…
148	}	204	}
149		205
150	sub hide {	206	sub hide {
151	my ($self) = @_;	207	my ($self) = @_;
152		208
153	return unless $self->{parent};	209	undef $GRAB if $GRAB == $self;
		210	undef $HOVER if $HOVER == $self;
154		211
155	$self->{parent}->remove ($self);	212	$self->{parent}->remove ($self)
		213	if $self->{parent};
156	}	214	}
157		215
158	sub move {	216	sub move {
159	my ($self, $x, $y, $z) = @_;	217	my ($self, $x, $y, $z) = @_;
160		218
…		…
163	$self->{z} = $z if defined $z;	221	$self->{z} = $z if defined $z;
164		222
165	$self->update;	223	$self->update;
166	}	224	}
167		225
168	sub needs_redraw {	226	sub set_size {
169	0	227	my ($self, $w, $h) = @_;
		228
		229	$self->{user_w} = $w;
		230	$self->{user_h} = $h;
		231
		232	$self->check_size;
170	}	233	}
171		234
172	sub size_request {	235	sub size_request {
173	require Carp;	236	require Carp;
174	Carp::confess "size_request is abstract";	237	Carp::confess "size_request is abstract";
…		…
194	$self->{y} = $y;	257	$self->{y} = $y;
195	$self->update;	258	$self->update;
196	}	259	}
197		260
198	if ($self->{w} != $w || $self->{h} != $h) {	261	if ($self->{w} != $w || $self->{h} != $h) {
199	$self->{w} = $w;	262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200	$self->{h} = $h;
201
202	$self->size_allocate ($w, $h);
203	$self->update;
204	}	263	}
205	}	264	}
206		265
207	sub size_allocate {	266	sub size_allocate {
208	# nothing to be done	267	# nothing to be done
209	}	268	}
210		269
211	# return top left coordinates	270	sub reconfigure {
212	sub _topleft {	271	my ($self) = @_;
		272
		273	$self->check_size (1);
		274	$self->update;
		275	}
		276
		277	sub children {
		278	}
		279
		280	sub set_max_size {
213	my ($self, $x, $y) = @_;	281	my ($self, $w, $h) = @_;
214		282
215	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	283	delete $self->{max_w}; $self->{max_w} = $w if $w;
		284	delete $self->{max_h}; $self->{max_h} = $h if $h;
216	}	285	}
217		286
218	# translate global coordinates to local coordinate system	287	# translate global coordinates to local coordinate system
219	sub coord2local {	288	sub coord2local {
220	my ($self, $x, $y) = @_;	289	my ($self, $x, $y) = @_;
221		290
222	my ($X, $Y) = $self->_topleft;	291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223	($x - $X, $y - $Y)
224	}	292	}
225		293
226	# translate local coordinates to global coordinate system	294	# translate local coordinates to global coordinate system
227	sub coord2global {	295	sub coord2global {
228	my ($self, $x, $y) = @_;	296	my ($self, $x, $y) = @_;
229		297
230	my ($X, $Y) = $self->_topleft;	298	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231	($x + $X, $y + $Y)
232	}	299	}
233		300
234	sub focus_in {	301	sub focus_in {
235	my ($self) = @_;	302	my ($self) = @_;
236		303
…		…
296	glVertex $x + $self->{w}, $y + $self->{h};	363	glVertex $x + $self->{w}, $y + $self->{h};
297	glVertex $x , $y + $self->{h};	364	glVertex $x , $y + $self->{h};
298	glEnd;	365	glEnd;
299	glDisable GL_BLEND;	366	glDisable GL_BLEND;
300	}	367	}
		368
		369	if ($ENV{PCLIENT_DEBUG}) {
		370	glPushMatrix;
		371	glColor 1, 1, 0, 1;
		372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		373	glBegin GL_LINE_LOOP;
		374	glVertex 0 , 0;
		375	glVertex $self->{w}, 0;
		376	glVertex $self->{w}, $self->{h};
		377	glVertex 0 , $self->{h};
		378	glEnd;
		379	glPopMatrix;
		380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		381	}
301	}	382	}
302		383
303	sub _draw {	384	sub _draw {
304	my ($self) = @_;	385	my ($self) = @_;
305		386
…		…
320		401
321	sub set_parent {	402	sub set_parent {
322	my ($self, $parent) = @_;	403	my ($self, $parent) = @_;
323		404
324	Scalar::Util::weaken ($self->{parent} = $parent);	405	Scalar::Util::weaken ($self->{parent} = $parent);
		406
		407	# TODO: req_w _does_change after ->reconfigure
		408	$self->check_size
		409	unless exists $self->{req_w};
325	}	410	}
326		411
327	sub check_size {	412	sub check_size {
328	my ($self) = @_;	413	my ($self, $forced) = @_;
329		414
330	return unless $self->{parent};	415	$self->{force_alloc} = 1 if $forced;
331		416	$CFClient::UI::ROOT->{check_size}{$self} = $self;
332	my ($w, $h) = $self->size_request;
333
334	if ($w != $self->{req_w} || $h != $self->{req_h}) {
335	$self->{req_w} = $w;
336	$self->{req_h} = $h;
337
338	$self->{parent}->check_size;
339	}
340	}	417	}
341		418
342	sub update {	419	sub update {
343	my ($self) = @_;	420	my ($self) = @_;
344		421
…		…
353	}	430	}
354		431
355	sub emit {	432	sub emit {
356	my ($self, $signal, @args) = @_;	433	my ($self, $signal, @args) = @_;
357		434
358	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359	$cb->($self, @args);
360	}
361	}	436	}
362		437
363	sub DESTROY {	438	sub DESTROY {
364	my ($self) = @_;	439	my ($self) = @_;
365		440
		441	delete $WIDGET{$self+0};
366	#$self->deactivate;	442	#$self->deactivate;
367	}	443	}
368		444
369	#############################################################################	445	#############################################################################
370		446
…		…
432	sub new {	508	sub new {
433	my ($class, %arg) = @_;	509	my ($class, %arg) = @_;
434		510
435	my $children = delete $arg{children} || [];	511	my $children = delete $arg{children} || [];
436		512
437	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	513	my $self = $class->SUPER::new (
		514	children => [],
		515	can_events => 0,
		516	%arg,
		517	);
438	$self->add ($_) for @$children;	518	$self->add ($_) for @$children;
439		519
440	$self	520	$self
441	}	521	}
442		522
443	sub add {	523	sub add {
444	my ($self, $child) = @_;	524	my ($self, @widgets) = @_;
445		525
446	$child->set_parent ($self);	526	$_->set_parent ($self)
		527	for @widgets;
447		528
448	use sort 'stable';	529	use sort 'stable';
449		530
450	$self->{children} = [	531	$self->{children} = [
451	sort { $a->{z} <=> $b->{z} }	532	sort { $a->{z} <=> $b->{z} }
452	@{$self->{children}}, $child	533	@{$self->{children}}, @widgets
453	];	534	];
454		535
455	$child->check_size;	536	$self->check_size (1);
		537	$self->update;
		538	}
		539
		540	sub children {
		541	@{ $_[0]{children} }
456	}	542	}
457		543
458	sub remove {	544	sub remove {
459	my ($self, $child) = @_;	545	my ($self, $child) = @_;
460		546
461	delete $child->{parent};	547	delete $child->{parent};
		548	$child->hide;
462		549
463	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		551
		552	$self->check_size;
		553	$self->update;
		554	}
		555
		556	sub clear {
		557	my ($self) = @_;
		558
		559	my $children = delete $self->{children};
		560	$self->{children} = [];
		561
		562	for (@$children) {
		563	delete $_->{parent};
		564	$_->hide;
		565	}
464		566
465	$self->check_size;	567	$self->check_size;
466	$self->update;	568	$self->update;
467	}	569	}
468		570
…		…
546	}	648	}
547		649
548	sub update {	650	sub update {
549	my ($self) = @_;	651	my ($self) = @_;
550		652
551	# we want to do this delayed...	653	$ROOT->on_post_alloc ($self => sub { $self->render_child });
552	$self->render_chld;
553	$self->SUPER::update;	654	$self->SUPER::update;
554	}
555
556	sub render_chld {
557	my ($self) = @_;
558
559	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560	glClearColor 0, 0, 0, 1;
561	glClear GL_COLOR_BUFFER_BIT;
562	$self->child->draw;
563	};
564	}	655	}
565		656
566	sub size_allocate {	657	sub size_allocate {
567	my ($self, $w, $h) = @_;	658	my ($self, $w, $h) = @_;
568		659
569	$self->child->configure (0, 0, $w, $h);	660	$self->SUPER::size_allocate ($w, $h);
		661	$self->update;
		662	}
570		663
		664	sub _render {
		665	$_[0]{children}[0]->draw;
		666	}
		667
		668	sub render_child {
		669	my ($self) = @_;
		670
		671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		672	glClearColor 0, 0, 0, 0;
		673	glClear GL_COLOR_BUFFER_BIT;
		674
571	$self->render_chld;	675	$self->_render;
		676	# glColorMask 1, 1, 1, 0;
		677	# glEnable GL_BLEND;
		678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		679	# glRasterPos 0, 0;
		680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		681	# glDisable GL_BLEND;
		682	# glColorMask 1, 1, 1, 1;
		683	};
572	}	684	}
573		685
574	sub _draw {	686	sub _draw {
575	my ($self) = @_;	687	my ($self) = @_;
576		688
577	my ($w, $h) = ($self->w, $self->h);	689	my ($w, $h) = ($self->w, $self->h);
578		690
579	my $tex = $self->{texture}	691	my $tex = $self->{texture}
580	or return;	692	or return;
581		693
582	glEnable GL_BLEND;
583	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584	glEnable GL_TEXTURE_2D;	694	glEnable GL_TEXTURE_2D;
585	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		696	glColor 0, 0, 0, 1;
586		697
587	$tex->draw_quad (0, 0, $w, $h);	698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588		699
589	glDisable GL_BLEND;
590	glDisable GL_TEXTURE_2D;	700	glDisable GL_TEXTURE_2D;
591	}	701	}
592		702
593	#############################################################################	703	#############################################################################
594		704
595	package CFClient::UI::ViewPort;	705	package CFClient::UI::ViewPort;
596		706
597	our @ISA = CFClient::UI::Window::;	707	our @ISA = CFClient::UI::Window::;
598		708
599	sub new { die }
600
601	sub size_request {	709	sub size_request {
602	my ($self) = @_;	710	my ($self) = @_;
603		711
604	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
606		714
607	@$self{qw(child_w child_h)}	715	@$self{qw(child_w child_h)}
608	}	716	}
609		717
610	sub _draw {	718	sub size_allocate {
611	my ($self) = @_;	719	my ($self, $w, $h) = @_;
612		720
613	$self->{children}[1]->draw;	721	$self->update;
614	}	722	}
615		723
		724	sub set_offset {
		725	my ($self, $x, $y) = @_;
616		726
617	#############################################################################	727	$self->{view_x} = int $x;
		728	$self->{view_y} = int $y;
618		729
		730	$self->update;
		731	}
		732
		733	# hmm, this does not work for topleft of $self... but we should not ask for that
		734	sub coord2local {
		735	my ($self, $x, $y) = @_;
		736
		737	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		738	}
		739
		740	sub coord2global {
		741	my ($self, $x, $y) = @_;
		742
		743	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		744	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		745
		746	$self->SUPER::coord2global ($x, $y)
		747	}
		748
		749	sub find_widget {
		750	my ($self, $x, $y) = @_;
		751
		752	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		753	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		754	) {
		755	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		756	} else {
		757	$self->CFClient::UI::Base::find_widget ($x, $y)
		758	}
		759	}
		760
		761	sub _render {
		762	my ($self) = @_;
		763
		764	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		765
		766	$self->SUPER::_render;
		767	}
		768
		769	#############################################################################
		770
619	package CFClient::UI::Frame;	771	package CFClient::UI::ScrolledWindow;
620		772
621	our @ISA = CFClient::UI::Bin::;	773	our @ISA = CFClient::UI::HBox::;
622
623	use CFClient::OpenGL;
624		774
625	sub new {	775	sub new {
626	my $class = shift;	776	my $class = shift;
627		777
		778	my $self;
		779
		780	my $slider = new CFClient::UI::Slider
		781	vertical => 1,
		782	range => [0, 0, 1, 0.01], # HACK fix
		783	connect_changed => sub {
		784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		785	},
		786	;
		787
628	my $self = $class->SUPER::new (	788	$self = $class->SUPER::new (
629	bg => [1, 1, 1, 1],	789	vp => (new CFClient::UI::ViewPort),
630	border_bg => [1, 1, 1, 1],	790	slider => $slider,
631	border => 0.8,
632	@_	791	@_,
633	);	792	);
634		793
		794	$self->{vp}->add ($self->{scrolled});
		795	$self->add ($self->{vp});
		796	$self->add ($self->{slider});
		797
635	$self	798	$self
636	}	799	}
637		800
638	sub set_size {	801	#TODO# update range on size_allocate depending on child
639	my ($self, $w, $h) = @_;	802	# update viewport offset on scroll
640	$self->{req_w} = $w;
641	$self->{req_h} = $h;
642	$self->check_size;
643	}
644		803
645	sub size_request {	804	#############################################################################
646	my ($self) = @_;
647	($self->{req_w}, $self->{req_h})
648	}
649		805
650	sub size_allocate {	806	package CFClient::UI::Frame;
651	my ($self, $w, $h) = @_;	807
652	$self->{w} = $w;	808	our @ISA = CFClient::UI::Bin::;
653	$self->{h} = $h;	809
654	$self->child->configure (0, 0, $w, $h);	810	use CFClient::OpenGL;
		811
		812	sub new {
		813	my $class = shift;
		814
		815	$class->SUPER::new (
		816	bg => undef,
		817	@_,
		818	)
655	}	819	}
656		820
657	sub _draw {	821	sub _draw {
658	my ($self) = @_;	822	my ($self) = @_;
659		823
660	my ($w, $h) = ($self->{w}, $self->{h});	824	if ($self->{bg}) {
		825	my ($w, $h) = @$self{qw(w h)};
661		826
662	glEnable GL_BLEND;	827	glEnable GL_BLEND;
663	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664	glEnable GL_TEXTURE_2D;	829	glColor @{ $self->{bg} };
665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666		830
667	# glBegin GL_QUADS;	831	glBegin GL_QUADS;
668	# glColor 0, 0, 0, 0;
669	# glVertex 0 , 0;	832	glVertex 0 , 0;
670	# glVertex 0 , $h;	833	glVertex 0 , $h;
671	# glVertex $w, $h;	834	glVertex $w, $h;
672	# glVertex $w, 0;	835	glVertex $w, 0;
673	# glEnd;	836	glEnd;
674		837
675
676	$self->child->draw;
677	glDisable GL_BLEND;	838	glDisable GL_BLEND;
678	glDisable GL_TEXTURE_2D;	839	}
		840
		841	$self->SUPER::_draw;
679	}	842	}
680		843
681	#############################################################################	844	#############################################################################
682		845
683	package CFClient::UI::FancyFrame;	846	package CFClient::UI::FancyFrame;
…		…
694	my $class = shift;	857	my $class = shift;
695		858
696	# TODO: user_x, user_y, overwrite moveto?	859	# TODO: user_x, user_y, overwrite moveto?
697		860
698	my $self = $class->SUPER::new (	861	my $self = $class->SUPER::new (
699	bg => [1, 1, 1, 1],	862	bg => [1, 1, 1, 1],
700	border_bg => [1, 1, 1, 1],	863	border_bg => [1, 1, 1, 1],
701	border => 0.8,	864	border => 0.6,
		865	toplevel => 1,
702	can_events => 1,	866	can_events => 1,
703	@_	867	@_
704	);	868	);
705		869
706	$self->{title} &&= new CFClient::UI::Label	870	$self->{title} &&= new CFClient::UI::Label
707	align => 0,	871	align => 0,
708	valign => 1,	872	valign => 1,
709	text => $self->{title},	873	text => $self->{title},
710	fontsize => 1;	874	fontsize => $self->{border};
711		875
712	$self	876	$self
713	}	877	}
714		878
715	sub border {	879	sub border {
716	int $_[0]{border} * $::FONTSIZE	880	int $_[0]{border} * $::FONTSIZE
717	}	881	}
718		882
719	sub size_request {	883	sub size_request {
720	my ($self) = @_;	884	my ($self) = @_;
721
722	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723		885
724	my ($w, $h) = $self->SUPER::size_request;	886	my ($w, $h) = $self->SUPER::size_request;
725		887
726	(	888	(
727	$w + $self->border * 2,	889	$w + $self->border * 2,
…		…
742	}	904	}
743		905
744	sub button_down {	906	sub button_down {
745	my ($self, $ev, $x, $y) = @_;	907	my ($self, $ev, $x, $y) = @_;
746		908
		909	my ($w, $h) = @$self{qw(w h)};
747	my $border = $self->border;	910	my $border = $self->border;
748		911
749	if ($x < $self->{w} && $x >= $self->{w} - $border	912	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750	&& $y < $self->{h} && $y >= $self->{h} - $border) {	913	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751		914
		915	if ($lr & $td) {
		916	my ($wx, $wy) = ($self->{x}, $self->{y});
752	my ($ox, $oy) = ($ev->{x}, $ev->{y});	917	my ($ox, $oy) = ($ev->{x}, $ev->{y});
753	my ($bw, $bh) = ($self->{w}, $self->{h});	918	my ($bw, $bh) = ($self->{w}, $self->{h});
754		919
		920	my $mx = $x < $border;
		921	my $my = $y < $border;
		922
755	$self->{motion} = sub {	923	$self->{motion} = sub {
756	my ($ev, $x, $y) = @_;	924	my ($ev, $x, $y) = @_;
757		925
758	($x, $y) = ($ev->{x}, $ev->{y});	926	my $dx = $ev->{x} - $ox;
		927	my $dy = $ev->{y} - $oy;
759		928
760	$self->{user_w} = $bw + $x - $ox;	929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761	$self->{user_h} = $bh + $y - $oy;	930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
762	$self->check_size;	932	$self->check_size;
763	};	933	};
764		934
765	} elsif ($x >= 0 && $x < $self->{w}	935	} elsif ($lr ^ $td) {
766	&& $y >= 0 && $y < $border) {
767
768	my ($ox, $oy) = ($ev->{x}, $ev->{y});	936	my ($ox, $oy) = ($ev->{x}, $ev->{y});
769	my ($bx, $by) = ($self->{x}, $self->{y});	937	my ($bx, $by) = ($self->{x}, $self->{y});
770		938
771	$self->{motion} = sub {	939	$self->{motion} = sub {
772	my ($ev, $x, $y) = @_;	940	my ($ev, $x, $y) = @_;
…		…
795	my ($self) = @_;	963	my ($self) = @_;
796		964
797	my ($w, $h ) = ($self->{w}, $self->{h});	965	my ($w, $h ) = ($self->{w}, $self->{h});
798	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	966	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799		967
800	glEnable GL_BLEND;
801	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802	glEnable GL_TEXTURE_2D;	968	glEnable GL_TEXTURE_2D;
803	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	969	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804		970
805	my $border = $self->border;	971	my $border = $self->border;
806		972
807	glColor @{ $self->{border_bg} };	973	glColor @{ $self->{border_bg} };
808	$tex[1]->draw_quad (0, 0, $w, $border);	974	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
809	$tex[3]->draw_quad (0, $border, $border, $ch);	975	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	976	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811	$tex[4]->draw_quad (0, $h - $border, $w, $border);	977	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812		978
		979	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813	my $bg = $tex[0];	980	my $bg = $tex[0];
814		981
815	# TODO: repeat texture not scale	982	# TODO: repeat texture not scale
816	my $rep_x = $cw / $bg->{w};	983	my $rep_x = $cw / $bg->{w};
817	my $rep_y = $ch / $bg->{h};	984	my $rep_y = $ch / $bg->{h};
818		985
819	glColor @{ $self->{bg} };	986	glColor @{ $self->{bg} };
820		987
821	$bg->{s} = $rep_x;	988	$bg->{s} = $rep_x;
822	$bg->{t} = $rep_y;	989	$bg->{t} = $rep_y;
823	$bg->{wrap_mode} = 1;	990	$bg->{wrap_mode} = 1;
824	$bg->draw_quad ($border, $border, $cw, $ch);	991	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		992	}
825		993
826	glDisable GL_TEXTURE_2D;	994	glDisable GL_TEXTURE_2D;
827	glDisable GL_BLEND;
828		995
829	$self->{title}->draw if $self->{title};	996	$self->{title}->draw if $self->{title};
		997
830	$self->child->draw;	998	$self->child->draw;
831	}	999	}
832		1000
833	#############################################################################	1001	#############################################################################
834		1002
…		…
856	$self->{children}[$y][$x] = $child;	1024	$self->{children}[$y][$x] = $child;
857		1025
858	$child->check_size;	1026	$child->check_size;
859	}	1027	}
860		1028
		1029	sub children {
		1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1031	}
		1032
861	# TODO: move to container class maybe? send childs a signal on removal?	1033	# TODO: move to container class maybe? send childs a signal on removal?
862	sub clear {	1034	sub clear {
863	my ($self) = @_;	1035	my ($self) = @_;
864		1036
		1037	my @children = $self->children;
865	delete $self->{children};	1038	delete $self->{children};
		1039
		1040	for (@children) {
		1041	delete $_->{parent};
		1042	$_->hide;
		1043	}
		1044
866	$self->update;	1045	$self->update;
867	}	1046	}
868		1047
869	sub get_wh {	1048	sub get_wh {
870	my ($self) = @_;	1049	my ($self) = @_;
…		…
1047	}	1226	}
1048		1227
1049	sub size_allocate {	1228	sub size_allocate {
1050	my ($self, $w, $h) = @_;	1229	my ($self, $w, $h) = @_;
1051		1230
		1231	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1232
1052	my $children = $self->{children};	1233	my $children = $self->{children};
1053		1234
1054	my @h = map $_->{req_h}, @$children;	1235	my @h = map $_->{req_h}, @$children;
1055		1236
1056	my $req_h = List::Util::sum @h;	1237	my $req_h = List::Util::sum @h;
…		…
1093		1274
1094	sub new {	1275	sub new {
1095	my ($class, %arg) = @_;	1276	my ($class, %arg) = @_;
1096		1277
1097	my $self = $class->SUPER::new (	1278	my $self = $class->SUPER::new (
1098	fg => [1, 1, 1],	1279	fg => [1, 1, 1],
		1280	#font => default_font
		1281	#text => initial text
		1282	#markup => initial narkup
		1283	layout => (new CFClient::Layout),
1099	fontsize => 1,	1284	fontsize => 1,
1100	text => "",
1101	align => -1,	1285	align => -1,
1102	valign => -1,	1286	valign => -1,
1103	padding => 2,	1287	padding => 2,
1104	layout => new CFClient::Layout,
1105	can_events => 0,	1288	can_events => 0,
1106	%arg	1289	%arg
1107	);	1290	);
1108		1291
1109	if (exists $self->{template}) {	1292	if (exists $self->{template}) {
1110	my $layout = new CFClient::Layout;	1293	my $layout = new CFClient::Layout;
1111	$layout->set_text (delete $self->{template});	1294	$layout->set_text (delete $self->{template});
1112	$self->{template} = $layout;	1295	$self->{template} = $layout;
1113	}	1296	}
1114		1297
1115	$self->set_text (delete $self->{text}) if exists $self->{text};	1298	if (exists $self->{markup}) {
1116	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1299	$self->set_markup (delete $self->{markup});
		1300	} else {
		1301	$self->set_text (delete $self->{text});
		1302	}
1117		1303
1118	$self	1304	$self
1119	}	1305	}
1120		1306
1121	sub escape_text {	1307	sub escape {
1122	local $_ = $_[1];	1308	local $_ = $_[1];
1123		1309
1124	s/&/&amp;/g;	1310	s/&/&amp;/g;
1125	s/>/&gt;/g;	1311	s/>/&gt;/g;
1126	s/</&lt;/g;	1312	s/</&lt;/g;
1127		1313
1128	$_[1]	1314	$_[1]
1129	}	1315	}
1130		1316
		1317	sub update {
		1318	my ($self) = @_;
		1319
		1320	delete $self->{texture};
		1321	$self->SUPER::update;
		1322	}
		1323
1131	sub set_text {	1324	sub set_text {
1132	my ($self, $text) = @_;	1325	my ($self, $text) = @_;
1133		1326
		1327	return if $self->{text} eq "T$text";
		1328	$self->{text} = "T$text";
		1329
		1330	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134	$self->{layout}->set_text ($text);	1331	$self->{layout}->set_text ($text);
1135		1332
1136	delete $self->{texture};	1333	$self->update;
1137	$self->check_size;	1334	$self->check_size;
1138	$self->update;
1139	}	1335	}
1140		1336
1141	sub set_markup {	1337	sub set_markup {
1142	my ($self, $markup) = @_;	1338	my ($self, $markup) = @_;
1143		1339
		1340	return if $self->{text} eq "M$markup";
		1341	$self->{text} = "M$markup";
		1342
		1343	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1344
		1345	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144	$self->{layout}->set_markup ($markup);	1346	$self->{layout}->set_markup ($markup);
1145		1347
1146	delete $self->{texture};	1348	$self->update;
1147	$self->check_size;	1349	$self->check_size;
1148	$self->update;
1149	}	1350	}
1150		1351
1151	sub size_request {	1352	sub size_request {
1152	my ($self) = @_;	1353	my ($self) = @_;
1153		1354
1154	$self->{layout}->set_width;	1355	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1356	$self->{layout}->set_width ($self->{max_w} || -1);
1155	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156		1358
1157	my ($w, $h) = $self->{layout}->size;	1359	my ($w, $h) = $self->{layout}->size;
1158		1360
1159	if (exists $self->{template}) {	1361	if (exists $self->{template}) {
		1362	$self->{template}->set_font ($self->{font}) if $self->{font};
1160	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1363	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161		1364
1162	my ($w2, $h2) = $self->{template}->size;	1365	my ($w2, $h2) = $self->{template}->size;
1163		1366
1164	$w = List::Util::max $w, $w2;	1367	$w = List::Util::max $w, $w2;
…		…
1179		1382
1180	sub set_fontsize {	1383	sub set_fontsize {
1181	my ($self, $fontsize) = @_;	1384	my ($self, $fontsize) = @_;
1182		1385
1183	$self->{fontsize} = $fontsize;	1386	$self->{fontsize} = $fontsize;
		1387	delete $self->{texture};
		1388
		1389	$self->update;
1184	$self->check_size;	1390	$self->check_size;
1185	}	1391	}
1186		1392
1187	sub _draw {	1393	sub _draw {
1188	my ($self) = @_;	1394	my ($self) = @_;
1189		1395
1190	my $tex = $self->{texture} ||= do {	1396	my $tex = $self->{texture} ||= do {
		1397	$self->{layout}->set_foreground (@{$self->{fg}});
		1398	$self->{layout}->set_font ($self->{font}) if $self->{font};
1191	$self->{layout}->set_width ($self->{w});	1399	$self->{layout}->set_width ($self->{w});
1192	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1401
1193	new_from_layout CFClient::Texture $self->{layout}	1402	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1403
		1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1406	: ($self->{w} - $tex->{w}) * 0.5;
		1407
		1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1410	: ($self->{h} - $tex->{h}) * 0.5;
		1411
		1412	$tex
1194	};	1413	};
1195		1414
1196	glEnable GL_BLEND;
1197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1198	glEnable GL_TEXTURE_2D;	1415	glEnable GL_TEXTURE_2D;
1199	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1200		1417
		1418	if ($tex->{format} == GL_ALPHA) {
1201	glColor @{$self->{fg}};	1419	glColor @{$self->{fg}};
1202
1203	$self->{ox} = int (
1204	$self->{align} < 0 ? $self->{padding}
1205	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1206	: ($self->{w} - $tex->{w}) * 0.5
1207	);
1208
1209	$self->{oy} = int (
1210	$self->{valign} < 0 ? $self->{padding}
1211	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1212	: ($self->{h} - $tex->{h}) * 0.5
1213	);
1214
1215	$tex->draw_quad ($self->{ox}, $self->{oy});	1420	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1421	} else {
		1422	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1423	}
1216		1424
1217	glDisable GL_TEXTURE_2D;	1425	glDisable GL_TEXTURE_2D;
1218	glDisable GL_BLEND;
1219	}	1426	}
1220		1427
1221	#############################################################################	1428	#############################################################################
1222		1429
1223	package CFClient::UI::EntryBase;	1430	package CFClient::UI::EntryBase;
…		…
1228		1435
1229	sub new {	1436	sub new {
1230	my $class = shift;	1437	my $class = shift;
1231		1438
1232	$class->SUPER::new (	1439	$class->SUPER::new (
1233	fg => [1, 1, 1],	1440	fg => [1, 1, 1],
1234	bg => [0, 0, 0, 0.2],	1441	bg => [0, 0, 0, 0.2],
1235	active_bg => [1, 1, 1, 0.5],	1442	active_bg => [1, 1, 1, 0.5],
1236	active_fg => [0, 0, 0],	1443	active_fg => [0, 0, 0],
1237	can_hover => 1,	1444	can_hover => 1,
1238	can_focus => 1,	1445	can_focus => 1,
1239	valign => 0,	1446	valign => 0,
1240	can_events => 1,	1447	can_events => 1,
1241	@_	1448	@_
1242	)	1449	)
1243	}	1450	}
1244		1451
…		…
1258	$self->{layout}->set_text ("$text ");	1465	$self->{layout}->set_text ("$text ");
1259		1466
1260	$self->emit (changed => $self->{text});	1467	$self->emit (changed => $self->{text});
1261	}	1468	}
1262		1469
		1470	sub set_text {
		1471	my ($self, $text) = @_;
		1472
		1473	$self->{cursor} = length $text;
		1474	$self->_set_text ($text);
		1475	$self->check_size;
		1476	$self->update;
		1477	}
		1478
1263	sub get_text {	1479	sub get_text {
1264	$_[0]{text}	1480	$_[0]{text}
1265	}	1481	}
1266		1482
1267	sub size_request {	1483	sub size_request {
…		…
1274		1490
1275	sub size_allocate {	1491	sub size_allocate {
1276	my ($self, $w, $h) = @_;	1492	my ($self, $w, $h) = @_;
1277		1493
1278	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1279	}
1280
1281	sub set_text {
1282	my ($self, $text) = @_;
1283
1284	$self->{cursor} = length $text;
1285	$self->_set_text ($text);
1286	$self->update;
1287	}	1495	}
1288		1496
1289	sub key_down {	1497	sub key_down {
1290	my ($self, $ev) = @_;	1498	my ($self, $ev) = @_;
1291		1499
…		…
1293	my $sym = $ev->{sym};	1501	my $sym = $ev->{sym};
1294	my $uni = $ev->{unicode};	1502	my $uni = $ev->{unicode};
1295		1503
1296	my $text = $self->get_text;	1504	my $text = $self->get_text;
1297		1505
1298	if ($sym == 8) {	1506	if ($uni == 8) {
1299	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1507	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1300	} elsif ($sym == 127) {	1508	} elsif ($uni == 127) {
1301	substr $text, $self->{cursor}, 1, "";	1509	substr $text, $self->{cursor}, 1, "";
1302	} elsif ($sym == CFClient::SDLK_LEFT) {	1510	} elsif ($sym == CFClient::SDLK_LEFT) {
1303	--$self->{cursor} if $self->{cursor};	1511	--$self->{cursor} if $self->{cursor};
1304	} elsif ($sym == CFClient::SDLK_RIGHT) {	1512	} elsif ($sym == CFClient::SDLK_RIGHT) {
1305	++$self->{cursor} if $self->{cursor} < length $self->{text};	1513	++$self->{cursor} if $self->{cursor} < length $self->{text};
1306	} elsif ($sym == CFClient::SDLK_HOME) {	1514	} elsif ($sym == CFClient::SDLK_HOME) {
1307	$self->{cursor} = 0;	1515	$self->{cursor} = 0;
1308	} elsif ($sym == CFClient::SDLK_END) {	1516	} elsif ($sym == CFClient::SDLK_END) {
1309	$self->{cursor} = length $text;	1517	$self->{cursor} = length $text;
1310	} elsif ($sym == 27) {	1518	} elsif ($uni == 27) {
1311	$self->emit ('escape');	1519	$self->emit ('escape');
1312	} elsif ($uni) {	1520	} elsif ($uni) {
1313	substr $text, $self->{cursor}++, 0, chr $uni;	1521	substr $text, $self->{cursor}++, 0, chr $uni;
1314	}	1522	}
1315		1523
…		…
1398	my ($self, $ev) = @_;	1606	my ($self, $ev) = @_;
1399		1607
1400	my $sym = $ev->{sym};	1608	my $sym = $ev->{sym};
1401		1609
1402	if ($sym == 13) {	1610	if ($sym == 13) {
		1611	unshift @{$self->{history}},
		1612	my $txt = $self->get_text;
		1613	$self->{history_pointer} = -1;
		1614	$self->{history_saveback} = '';
1403	$self->emit (activate => $self->get_text);	1615	$self->emit (activate => $txt);
1404	$self->update;	1616	$self->update;
		1617
		1618	} elsif ($sym == CFClient::SDLK_UP) {
		1619	if ($self->{history_pointer} < 0) {
		1620	$self->{history_saveback} = $self->get_text;
		1621	}
		1622	if (@{$self->{history} || []} > 0) {
		1623	$self->{history_pointer}++;
		1624	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1625	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1626	}
		1627	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1628	}
		1629
		1630	} elsif ($sym == CFClient::SDLK_DOWN) {
		1631	$self->{history_pointer}--;
		1632	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1633
		1634	if ($self->{history_pointer} >= 0) {
		1635	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1636	} else {
		1637	$self->set_text ($self->{history_saveback});
		1638	}
1405		1639
1406	} else {	1640	} else {
1407	$self->SUPER::key_down ($ev);	1641	$self->SUPER::key_down ($ev);
1408	}	1642	}
1409		1643
…		…
1423		1657
1424	sub new {	1658	sub new {
1425	my $class = shift;	1659	my $class = shift;
1426		1660
1427	$class->SUPER::new (	1661	$class->SUPER::new (
1428	padding => 4,	1662	padding => 4,
1429	fg => [1, 1, 1],	1663	fg => [1, 1, 1],
1430	bg => [1, 1, 1, 0.2],	1664	bg => [1, 1, 1, 0.2],
1431	active_fg => [0, 0, 1],	1665	active_fg => [0, 0, 1],
1432	can_hover => 1,	1666	can_hover => 1,
1433	align => 0,	1667	align => 0,
1434	valign => 0,	1668	valign => 0,
1435	can_events => 1,	1669	can_events => 1,
1436	@_	1670	@_
1437	)	1671	)
1438	}	1672	}
1439		1673
…		…
1453		1687
1454	if ($GRAB == $self) {	1688	if ($GRAB == $self) {
1455	$self->{fg} = $self->{active_fg};	1689	$self->{fg} = $self->{active_fg};
1456	}	1690	}
1457		1691
1458	glEnable GL_BLEND;
1459	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1460	glEnable GL_TEXTURE_2D;	1692	glEnable GL_TEXTURE_2D;
1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1693	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462	glColor 0, 0, 0, 1;	1694	glColor 0, 0, 0, 1;
1463		1695
1464	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1696	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1465		1697
1466	glDisable GL_TEXTURE_2D;	1698	glDisable GL_TEXTURE_2D;
1467	glDisable GL_BLEND;
1468		1699
1469	$self->SUPER::_draw;	1700	$self->SUPER::_draw;
1470	}	1701	}
1471		1702
1472	#############################################################################	1703	#############################################################################
…		…
1519		1750
1520	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1751	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1521		1752
1522	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1753	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1523		1754
1524	glEnable GL_BLEND;	1755	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1756
1525	glEnable GL_TEXTURE_2D;	1757	glEnable GL_TEXTURE_2D;
1526	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1527
1528	my $tex = $self->{state} ? $tex[1] : $tex[0];
1529
1530	$tex->draw_quad (0, 0, $s, $s);	1758	$tex->draw_quad_alpha (0, 0, $s, $s);
1531
1532	glDisable GL_TEXTURE_2D;	1759	glDisable GL_TEXTURE_2D;
1533	glDisable GL_BLEND;
1534	}	1760	}
1535		1761
1536	#############################################################################	1762	#############################################################################
1537		1763
1538	package CFClient::UI::Image;	1764	package CFClient::UI::Image;
…		…
1581	glTranslate 0, -$self->{w}, 0;	1807	glTranslate 0, -$self->{w}, 0;
1582		1808
1583	($w, $h) = ($h, $w);	1809	($w, $h) = ($h, $w);
1584	}	1810	}
1585		1811
1586	glEnable GL_BLEND;
1587	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1588	glEnable GL_TEXTURE_2D;	1812	glEnable GL_TEXTURE_2D;
1589	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1590		1814
1591	$tex->draw_quad (0, 0, $w, $h);	1815	$tex->draw_quad_alpha (0, 0, $w, $h);
1592		1816
1593	glDisable GL_BLEND;
1594	glDisable GL_TEXTURE_2D;	1817	glDisable GL_TEXTURE_2D;
1595	}	1818	}
1596		1819
1597	#############################################################################	1820	#############################################################################
1598		1821
1599	package CFClient::UI::VGauge;	1822	package CFClient::UI::VGauge;
1600		1823
1601	our @ISA = CFClient::UI::Base::;	1824	our @ISA = CFClient::UI::Base::;
		1825
		1826	use List::Util qw(min max);
1602		1827
1603	use CFClient::OpenGL;	1828	use CFClient::OpenGL;
1604		1829
1605	my %tex = (	1830	my %tex = (
1606	food => [	1831	food => [
1607	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1832	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1833	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609	],	1834	],
1610	grace => [	1835	grace => [
1611	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1836	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1837	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1613	],	1838	],
1614	hp => [	1839	hp => [
1615	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1840	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1841	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617	],	1842	],
1618	mana => [	1843	mana => [
1619	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1844	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1845	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1621	],	1846	],
1622	);	1847	);
1623		1848
1624	# eg. VGauge->new (gauge => 'food'), default gauge: food	1849	# eg. VGauge->new (gauge => 'food'), default gauge: food
1625	sub new {	1850	sub new {
…		…
1644	}	1869	}
1645		1870
1646	sub set_max {	1871	sub set_max {
1647	my ($self, $max) = @_;	1872	my ($self, $max) = @_;
1648		1873
		1874	return if $self->{max_val} == $max;
		1875
1649	$self->{max_val} = $max;	1876	$self->{max_val} = $max;
		1877	$self->update;
1650	}	1878	}
1651		1879
1652	sub set_value {	1880	sub set_value {
1653	my ($self, $val, $max) = @_;	1881	my ($self, $val, $max) = @_;
1654		1882
1655	$self->set_max ($max)	1883	$self->set_max ($max)
1656	if defined $max;	1884	if defined $max;
1657		1885
1658	$max = $self->{max_val};	1886	return if $self->{val} == $val;
		1887
1659	$self->{val} = $val;	1888	$self->{val} = $val;
1660
1661	$self->update;	1889	$self->update;
1662	}	1890	}
1663		1891
1664	sub _draw {	1892	sub _draw {
1665	my ($self) = @_;	1893	my ($self) = @_;
1666		1894
1667	my $tex = $tex{$self->{type}};	1895	my $tex = $tex{$self->{type}};
		1896	my ($t1, $t2, $t3) = @$tex;
1668		1897
1669	my ($w, $h) = ($self->{w}, $self->{h});	1898	my ($w, $h) = ($self->{w}, $self->{h});
1670		1899
1671	if ($self->{vertical}) {	1900	if ($self->{vertical}) {
1672	glRotate 90, 0, 0, 1;	1901	glRotate 90, 0, 0, 1;
…		…
1674		1903
1675	($w, $h) = ($h, $w);	1904	($w, $h) = ($h, $w);
1676	}	1905	}
1677		1906
1678	my $ycut = $self->{val} / ($self->{max_val} || 1);	1907	my $ycut = $self->{val} / ($self->{max_val} || 1);
1679	$ycut = 1 if $self->{val} > $self->{max_val};
1680		1908
1681	my $t1 = $tex->[0];	1909	my $ycut1 = max 0, min 1, $ycut;
1682	my $t2 = $tex->[1];	1910	my $ycut2 = max 0, min 1, $ycut - 1;
		1911
		1912	my $h1 = $self->{h} * (1 - $ycut1);
		1913	my $h2 = $self->{h} * (1 - $ycut2);
1683		1914
1684	glEnable GL_BLEND;	1915	glEnable GL_BLEND;
1685	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1916	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1687	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688		1919
1689	my $h1 = $self->{h} - $ycut * $self->{h};
1690	my $h2 = $ycut * $self->{h};
1691
1692	glBindTexture GL_TEXTURE_2D, $t1->{name};	1920	glBindTexture GL_TEXTURE_2D, $t1->{name};
1693	glBegin GL_QUADS;	1921	glBegin GL_QUADS;
1694	glTexCoord 0 , 0; glVertex 0 , 0;	1922	glTexCoord 0 , 0; glVertex 0 , 0;
1695	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;	1923	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;	1924	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697	glTexCoord $t1->{s}, 0; glVertex $w, 0;	1925	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698	glEnd;	1926	glEnd;
1699		1927
		1928	my $ycut1 = List::Util::min 1, $ycut;
1700	glBindTexture GL_TEXTURE_2D, $t2->{name};	1929	glBindTexture GL_TEXTURE_2D, $t2->{name};
1701	glBegin GL_QUADS;	1930	glBegin GL_QUADS;
1702	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;	1931	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;	1932	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;	1933	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;	1934	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706	glEnd;	1935	glEnd;
		1936
		1937	if ($t3) {
		1938	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1939	glBegin GL_QUADS;
		1940	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1941	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1942	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1943	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1944	glEnd;
		1945	}
1707		1946
1708	glDisable GL_BLEND;	1947	glDisable GL_BLEND;
1709	glDisable GL_TEXTURE_2D;	1948	glDisable GL_TEXTURE_2D;
1710	}	1949	}
1711		1950
…		…
1717		1956
1718	sub new {	1957	sub new {
1719	my ($class, %arg) = @_;	1958	my ($class, %arg) = @_;
1720		1959
1721	my $self = $class->SUPER::new (	1960	my $self = $class->SUPER::new (
1722	tooltip => $arg{type},	1961	tooltip => $arg{type},
		1962	can_hover => 1,
		1963	can_events => 1,
1723	%arg,	1964	%arg,
1724	);	1965	);
1725		1966
1726	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1967	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1727	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);	1968	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1728	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	1969	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729		1970
1730	$self	1971	$self
1731	}	1972	}
1732		1973
…		…
1735		1976
1736	$self->{value}->set_fontsize ($fsize);	1977	$self->{value}->set_fontsize ($fsize);
1737	$self->{max} ->set_fontsize ($fsize);	1978	$self->{max} ->set_fontsize ($fsize);
1738	}	1979	}
1739		1980
		1981	sub set_max {
		1982	my ($self, $max) = @_;
		1983
		1984	$self->{gauge}->set_max ($max);
		1985	$self->{max}->set_text ($max);
		1986	}
		1987
1740	sub set_value {	1988	sub set_value {
1741	my ($self, $val, $max) = @_;	1989	my ($self, $val, $max) = @_;
1742		1990
1743	$self->set_max ($max)	1991	$self->set_max ($max)
1744	if defined $max;	1992	if defined $max;
1745		1993
1746	$self->{gauge}->set_value ($val, $max);	1994	$self->{gauge}->set_value ($val, $max);
1747	$self->{value}->set_text ($val);	1995	$self->{value}->set_text ($val);
1748	}
1749
1750	sub set_max {
1751	my ($self, $max) = @_;
1752
1753	$self->{gauge}->set_max ($max);
1754	$self->{max}->set_text ($max);
1755	}	1996	}
1756		1997
1757	#############################################################################	1998	#############################################################################
1758		1999
1759	package CFClient::UI::Slider;	2000	package CFClient::UI::Slider;
…		…
1769	qw(s1_slider.png s1_slider_bg.png);	2010	qw(s1_slider.png s1_slider_bg.png);
1770		2011
1771	sub new {	2012	sub new {
1772	my $class = shift;	2013	my $class = shift;
1773		2014
1774	# range [value, low, high, page]	2015	# range [value, low, high, page, unit]
1775		2016
1776	# TODO: 0-width page	2017	# TODO: 0-width page
1777	# TODO: req_w/h are wrong with vertical	2018	# TODO: req_w/h are wrong with vertical
1778	# TODO: calculations are off	2019	# TODO: calculations are off
1779	my $self = $class->SUPER::new (	2020	my $self = $class->SUPER::new (
1780	fg => [1, 1, 1],	2021	fg => [1, 1, 1],
1781	active_fg => [0, 0, 0],	2022	active_fg => [0, 0, 0],
1782	range => [0, 0, 100, 10],	2023	range => [0, 0, 100, 10],
1783	req_w => 20,	2024	req_w => $::WIDTH / 80,
1784	req_h => 20,	2025	req_h => $::WIDTH / 80,
1785	vertical => 0,	2026	vertical => 0,
1786	can_hover => 1,	2027	can_hover => 1,
1787	inner_pad => 5,	2028	inner_pad => .05,
1788	@_	2029	@_
1789	);	2030	);
1790		2031
		2032	$self->set_value ($self->{range}[0]);
		2033	$self->update;
		2034
1791	$self	2035	$self
		2036	}
		2037
		2038	sub set_value {
		2039	my ($self, $value) = @_;
		2040
		2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2042
		2043	$hi = $lo + 1 if $hi <= $lo;
		2044
		2045	$value = $lo if $value < $lo;
		2046	$value = $hi if $value > $hi;
		2047
		2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2049	if $unit;
		2050
		2051	$page = $hi - $lo if $page > $hi - $lo;
		2052
		2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2054
		2055	if ($value != $old_value) {
		2056	$self->emit (changed => $value);
		2057	$self->update;
		2058	}
1792	}	2059	}
1793		2060
1794	sub size_request {	2061	sub size_request {
1795	my ($self) = @_;	2062	my ($self) = @_;
1796		2063
…		…
1809		2076
1810	sub mouse_motion {	2077	sub mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2078	my ($self, $ev, $x, $y) = @_;
1812		2079
1813	if ($GRAB == $self) {	2080	if ($GRAB == $self) {
		2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2082
		2083	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2084
		2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2086
		2087	$self->set_value ($x * ($hi - $lo) + $lo);
		2088	}
		2089	}
		2090
		2091	sub update {
		2092	my ($self) = @_;
		2093
		2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2095	$self->set_value ($self->{range}[0]);
		2096
1814	my ($value, $lo, $hi, $page) = @{$self->{range}};	2097	my ($value, $lo, $hi, $page) = @{$self->{range}};
1815		2098
1816	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2099	my $inner_w = 1 - 2 * $self->{inner_pad};
1817		2100
1818	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2101	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1819	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1820		2102
1821	$x -= $inner_pad_px; # substract the padding	2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1822	$x = $x * ($hi - $lo) / $inner_w + $lo;	2104	$value = $self->{scale} * ($value - $lo);
1823	$x = $lo if $x < $lo;
1824	$x = $hi - $page if $x > $hi - $page;
1825	$self->{range}[0] = $x;
1826		2105
1827	$self->emit (changed => $x);	2106	$value = $self->{inner_pad} + ($value - $page * 0.5);
1828	$self->update;	2107
		2108	$value = 0 if $value < 0;
		2109	$page = 1 - $value if $value + $page > 1;
		2110
		2111	$self->{knob_x} = $value;
		2112	$self->{knob_w} = $page;
1829	}	2113	});
1830	}
1831		2114
1832	# the inner_* stuff is for generating a padding for the slider handle,	2115	$self->SUPER::update;
1833	# so that the handle doesn't leave the texture. This calculation isn't 100%
1834	# correct propably, but it does the job for now
1835	sub _calc_inner_pad_px {
1836	my ($self, $w) = @_;
1837	($w / 100) * $self->{inner_pad} # % to pixels
1838	}	2116	}
1839		2117
1840	sub _draw {	2118	sub _draw {
1841	my ($self) = @_;	2119	my ($self) = @_;
1842		2120
1843	$self->SUPER::_draw ();	2121	$self->SUPER::_draw ();
1844		2122
1845	my ($w, $h) = @$self{qw(w h)};	2123	glScale $self->{w}, $self->{h};
1846		2124
1847	if ($self->{vertical}) {	2125	if ($self->{vertical}) {
1848	# draw a vertical slider like a rotated horizontal slider	2126	# draw a vertical slider like a rotated horizontal slider
1849		2127
1850	glRotate 90, 0, 0, 1;	2128	glRotate 90, 0, 0, 1;
1851	glTranslate 0, -$self->{w}, 0;	2129	glTranslate 0, 1, 0;
1852
1853	($w, $h) = ($h, $w);
1854	}	2130	}
1855		2131
1856	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1857	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1858		2134
1859	my ($value, $lo, $hi, $page) = @{$self->{range}};
1860
1861	$hi = $value + 1 if $lo == $hi;
1862
1863	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1864	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1865
1866	$page = int $page * $inner_w / ($hi - $lo);
1867	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1868
1869	$w -= $page;
1870	$page &= ~1;
1871	glTranslate $page * 0.5, 0, 0;
1872	$page ||= 2;
1873
1874	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1875	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1876
1877	glEnable GL_BLEND;
1878	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1879	glEnable GL_TEXTURE_2D;	2135	glEnable GL_TEXTURE_2D;
1880	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1881		2137
1882	# draw background	2138	# draw background
1883	$tex[1]->draw_quad (0, 0, $w, $h);	2139	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1884		2140
1885	# draw handle	2141	# draw handle
1886	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1887		2143
1888	glDisable GL_BLEND;
1889	glDisable GL_TEXTURE_2D;	2144	glDisable GL_TEXTURE_2D;
1890	}	2145	}
1891		2146
1892	#############################################################################	2147	#############################################################################
1893		2148
…		…
1899		2154
1900	sub new {	2155	sub new {
1901	my $class = shift;	2156	my $class = shift;
1902		2157
1903	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
1904	fontsize => 1,	2159	fontsize => 1,
		2160	can_events => 0,
		2161	#font => default_font
1905	@_,	2162	@_,
1906		2163
1907	layout => (new CFClient::Layout),	2164	layout => (new CFClient::Layout 1),
1908	par => [],	2165	par => [],
1909	height => 0,	2166	height => 0,
1910	children => [	2167	children => [
1911	(new CFClient::UI::Empty expand => 1),	2168	(new CFClient::UI::Empty expand => 1),
1912	(new CFClient::UI::Slider vertical => 1),	2169	(new CFClient::UI::Slider vertical => 1),
1913	],	2170	],
1914	);	2171	);
1915		2172
1916	$self->{children}[1]->connect (changed => sub {	2173	$self->{children}[1]->connect (changed => sub { $self->update });
1917	$self->update;
1918	});
1919		2174
1920	$self	2175	$self
1921	}	2176	}
1922		2177
1923	sub set_fontsize {	2178	sub set_fontsize {
…		…
1931	my ($self, $text) = @_;	2186	my ($self, $text) = @_;
1932		2187
1933	my $layout = $self->{layout};	2188	my $layout = $self->{layout};
1934		2189
1935	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2190	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936	$layout->set_width ($self->{w});	2191	$layout->set_width ($self->{children}[0]{w});
1937	$layout->set_text ($text);	2192	$layout->set_markup ($text);
1938		2193
1939	($layout->size)[1]	2194	($layout->size)[1]
1940	}	2195	}
1941		2196
1942	sub reflow {	2197	sub reflow {
…		…
1949	sub size_allocate {	2204	sub size_allocate {
1950	my ($self, $w, $h) = @_;	2205	my ($self, $w, $h) = @_;
1951		2206
1952	$self->SUPER::size_allocate ($w, $h);	2207	$self->SUPER::size_allocate ($w, $h);
1953		2208
		2209	$self->{layout}->set_font ($self->{font}) if $self->{font};
1954	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2210	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955	$self->{layout}->set_width ($self->{children}[0]{w});	2211	$self->{layout}->set_width ($self->{children}[0]{w});
1956		2212
1957	$self->reflow;	2213	$self->reflow;
1958	}	2214	}
…		…
1979		2235
1980	return unless $self->{h} > 0;	2236	return unless $self->{h} > 0;
1981		2237
1982	delete $self->{texture};	2238	delete $self->{texture};
1983		2239
1984	$ROOT->on_refresh ($self, sub {	2240	$ROOT->on_post_alloc ($self, sub {
1985	if (delete $self->{need_reflow}) {	2241	if (delete $self->{need_reflow}) {
1986	my $height = 0;	2242	my $height = 0;
1987		2243
1988	$height += $_->[0] = $self->text_height ($_->[2])	2244	$height += $_->[0] = $self->text_height ($_->[2])
1989	for @{$self->{par}};	2245	for @{$self->{par}};
…		…
1993	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1994		2250
1995	delete $self->{texture};	2251	delete $self->{texture};
1996	}	2252	}
1997		2253
1998	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2254	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1999	glClearColor 0, 0, 0, 1;	2255	glClearColor 0, 0, 0, 0;
2000	glClear GL_COLOR_BUFFER_BIT;	2256	glClear GL_COLOR_BUFFER_BIT;
2001		2257
2002	glEnable GL_BLEND;
2003	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2004	glEnable GL_TEXTURE_2D;	2258	glEnable GL_TEXTURE_2D;
2005	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2259	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2006		2260
2007	my $top = int $self->{children}[1]{range}[0];	2261	my $top = int $self->{children}[1]{range}[0];
2008		2262
…		…
2011		2265
2012	my $y = 0;	2266	my $y = 0;
2013		2267
2014	my $layout = $self->{layout};	2268	my $layout = $self->{layout};
2015		2269
		2270	$layout->set_font ($self->{font}) if $self->{font};
		2271
2016	for my $par (@{$self->{par}}) {	2272	for my $par (@{$self->{par}}) {
2017	my $h = $par->[0];	2273	my $h = $par->[0];
2018		2274
2019	if ($y0 < $y + $h && $y < $y1) {	2275	if ($y0 < $y + $h && $y < $y1) {
		2276	$layout->set_foreground (@{ $par->[1] });
2020	$layout->set_text ($par->[2]);	2277	$layout->set_markup ($par->[2]);
2021		2278
2022	glColor @{ $par->[1] };
2023	my ($W, $H) = $layout->size;	2279	my ($W, $H) = $layout->size;
2024	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2280	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2025	}	2281	}
2026		2282
2027	$y += $h;	2283	$y += $h;
2028	}	2284	}
2029		2285
2030	glDisable GL_TEXTURE_2D;	2286	glDisable GL_TEXTURE_2D;
2031	glDisable GL_BLEND;
2032	};	2287	};
2033	});	2288	});
2034	}	2289	}
2035		2290
2036	sub _draw {	2291	sub _draw {
2037	my ($self) = @_;	2292	my ($self) = @_;
2038		2293
2039	if ($self->{texture}) {
2040	glEnable GL_TEXTURE_2D;	2294	glEnable GL_TEXTURE_2D;
2041	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2042	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2296	glColor 1, 1, 1, 1;
		2297	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2043	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2044	}
2045		2299
2046	$self->{children}[1]->draw;	2300	$self->{children}[1]->draw;
2047		2301
2048	}	2302	}
2049		2303
…		…
2097		2351
2098	sub new {	2352	sub new {
2099	my $class = shift;	2353	my $class = shift;
2100		2354
2101	my $self = $class->SUPER::new (	2355	my $self = $class->SUPER::new (
2102	state => 0,	2356	state => 0,
2103	connect_activate => \&toggle_flopper,	2357	connect_activate => \&toggle_flopper,
2104	can_events => 1,
2105	@_	2358	@_
2106	);	2359	);
2107		2360
2108	if ($self->{state}) {	2361	if ($self->{state}) {
2109	$self->{state} = 0;	2362	$self->{state} = 0;
…		…
2129	$self->emit (changed => $self->{state});	2382	$self->emit (changed => $self->{state});
2130	}	2383	}
2131		2384
2132	#############################################################################	2385	#############################################################################
2133		2386
		2387	package CFClient::UI::Tooltip;
		2388
		2389	our @ISA = CFClient::UI::Bin::;
		2390
		2391	use CFClient::OpenGL;
		2392
		2393	sub new {
		2394	my $class = shift;
		2395
		2396	$class->SUPER::new (
		2397	@_,
		2398	can_events => 0,
		2399	)
		2400	}
		2401
		2402	sub set_tooltip_from {
		2403	my ($self, $widget) = @_;
		2404
		2405	$self->add (new CFClient::UI::Label
		2406	markup => $widget->{tooltip},
		2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2408	fontsize => 0.8,
		2409	fg => [0, 0, 0, 1],
		2410	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2411	);
		2412	}
		2413
		2414	sub size_request {
		2415	my ($self) = @_;
		2416
		2417	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2418
		2419	($w + 4, $h + 4)
		2420	}
		2421
		2422	sub size_allocate {
		2423	my ($self, $w, $h) = @_;
		2424
		2425	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2426	}
		2427
		2428	sub _draw {
		2429	my ($self) = @_;
		2430
		2431	glTranslate 0.375, 0.375;
		2432
		2433	my ($w, $h) = @$self{qw(w h)};
		2434
		2435	glColor 1, 0.8, 0.4;
		2436	glBegin GL_QUADS;
		2437	glVertex 0 , 0;
		2438	glVertex 0 , $h;
		2439	glVertex $w, $h;
		2440	glVertex $w, 0;
		2441	glEnd;
		2442
		2443	glColor 0, 0, 0;
		2444	glBegin GL_LINE_LOOP;
		2445	glVertex 0 , 0;
		2446	glVertex 0 , $h;
		2447	glVertex $w, $h;
		2448	glVertex $w, 0;
		2449	glEnd;
		2450
		2451	glTranslate 2 - 0.375, 2 - 0.375;
		2452	$self->SUPER::_draw;
		2453	}
		2454
		2455	#############################################################################
		2456
		2457	package CFClient::UI::Face;
		2458
		2459	our @ISA = CFClient::UI::Base::;
		2460
		2461	use CFClient::OpenGL;
		2462
		2463	sub new {
		2464	my $class = shift;
		2465
		2466	$class->SUPER::new (
		2467	aspect => 1,
		2468	@_,
		2469	)
		2470	}
		2471
		2472	sub size_request {
		2473	(32, 8)
		2474	}
		2475
		2476	sub _draw {
		2477	my ($self) = @_;
		2478
		2479	return unless $::CONN;#d# manage and cache textures differently
		2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2481
		2482	# TODO animation
		2483	if ($tex) {
		2484	glEnable GL_TEXTURE_2D;
		2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2486	glColor 1, 1, 1, 1;
		2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2488	glDisable GL_TEXTURE_2D;
		2489	}
		2490	}
		2491
		2492	#############################################################################
		2493
		2494	package CFClient::UI::InventoryItem;
		2495
		2496	our @ISA = CFClient::UI::HBox::;
		2497
		2498	sub new {
		2499	my $class = shift;
		2500
		2501	my %args = @_;
		2502
		2503	my $item = delete $args{item};
		2504
		2505	my $desc = $item->{nrof} < 2
		2506	? $item->{name}
		2507	: "$item->{nrof} $item->{name_pl}";
		2508
		2509	$item->{flags} & Crossfire::Protocol::F_OPEN
		2510	and $desc .= " (open)";
		2511	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2512	and $desc .= " (applied)";
		2513	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2514	and $desc .= " (unpaid)";
		2515	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2516	and $desc .= " (magic)";
		2517	$item->{flags} & Crossfire::Protocol::F_CURSED
		2518	and $desc .= " (cursed)";
		2519	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2520	and $desc .= " (damned)";
		2521	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2522	and $desc .= " *";
		2523
		2524	my $self = $class->SUPER::new (
		2525	can_hover => 1,
		2526	can_events => 1,
		2527	tooltip => (CFClient::UI::Label->escape ($desc)
		2528	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2529	connect_button_down => sub {
		2530	my ($self, $ev, $x, $y) = @_;
		2531
		2532	# todo: maybe put examine on 1? but should just be a tooltip :(
		2533	if ($ev->{button} == 1) {
		2534	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2535	} elsif ($ev->{button} == 2) {
		2536	$::CONN->send ("apply $item->{tag}");
		2537	} elsif ($ev->{button} == 3) {
		2538	my @menu_items = (
		2539	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2540	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2541	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2542	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2543	[
		2544	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2545	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
		2546	],
		2547	);
		2548
		2549	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2550	}
		2551
		2552	1
		2553	},
		2554	%args
		2555	);
		2556
		2557	$self->add (new CFClient::UI::Face
		2558	can_events => 0,
		2559	face => $item->{face},
		2560	anim => $item->{anim},
		2561	animspeed => $item->{animspeed},
		2562	);
		2563
		2564	$self->add (new CFClient::UI::Label
		2565	can_events => 0,
		2566	text => $desc,
		2567	);
		2568
		2569	$self
		2570	}
		2571
		2572	#############################################################################
		2573
		2574	package CFClient::UI::Inventory;
		2575
		2576	our @ISA = CFClient::UI::ScrolledWindow::;
		2577
		2578	sub new {
		2579	my $class = shift;
		2580
		2581	my $self = $class->SUPER::new (
		2582	scrolled => (new CFClient::UI::VBox),
		2583	@_,
		2584	);
		2585
		2586	$self
		2587	}
		2588
		2589	sub set_items {
		2590	my ($self, $items) = @_;
		2591
		2592	$self->{scrolled}->clear;
		2593	return unless $items;
		2594
		2595	my @items = sort {
		2596	($a->{type} <=> $b->{type})
		2597	or ($a->{name} cmp $b->{name})
		2598	} @$items;
		2599
		2600	$self->{real_items} = \@items;
		2601
		2602	for my $item (@items) {
		2603	my $desc = $item->{nrof} < 2
		2604	? $item->{name}
		2605	: "$item->{nrof} $item->{name_pl}";
		2606
		2607	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2608	}
		2609
		2610	$self->{scrolled}->add (@items);
		2611
		2612	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2613	}
		2614
		2615	sub size_request {
		2616	my ($self) = @_;
		2617	($self->{req_w}, $self->{req_h});
		2618	}
		2619
		2620	#############################################################################
		2621
		2622	package CFClient::UI::Menu;
		2623
		2624	our @ISA = CFClient::UI::FancyFrame::;
		2625
		2626	use CFClient::OpenGL;
		2627
		2628	sub new {
		2629	my $class = shift;
		2630
		2631	my $self = $class->SUPER::new (
		2632	items => [],
		2633	z => 100,
		2634	@_,
		2635	);
		2636
		2637	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2638
		2639	for my $item (@{ $self->{items} }) {
		2640	my ($widget, $cb) = @$item;
		2641
		2642	# handle various types of items, only text for now
		2643	if (!ref $widget) {
		2644	$widget = new CFClient::UI::Label
		2645	can_hover => 1,
		2646	can_events => 1,
		2647	text => $widget;
		2648	}
		2649
		2650	$self->{item}{$widget} = $item;
		2651
		2652	$self->{vbox}->add ($widget);
		2653	}
		2654
		2655	$self
		2656	}
		2657
		2658	# popup given the event (must be a mouse button down event currently)
		2659	sub popup {
		2660	my ($self, $ev) = @_;
		2661
		2662	$self->emit ("popdown");
		2663
		2664	# maybe save $GRAB? must be careful about events...
		2665	$GRAB = $self;
		2666	$self->{button} = $ev->{button};
		2667
		2668	$self->show;
		2669	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2670	}
		2671
		2672	sub mouse_motion {
		2673	my ($self, $ev, $x, $y) = @_;
		2674
		2675	# TODO: should use vbox->find_widget or so
		2676	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2677	$self->{hover} = $self->{item}{$HOVER};
		2678	}
		2679
		2680	sub button_up {
		2681	my ($self, $ev, $x, $y) = @_;
		2682
		2683	if ($ev->{button} == $self->{button}) {
		2684	undef $GRAB;
		2685	$self->hide;
		2686
		2687	$self->emit ("popdown");
		2688	$self->{hover}[1]->() if $self->{hover};
		2689	}
		2690	}
		2691
		2692	#############################################################################
		2693
		2694	package CFClient::UI::Statusbox;
		2695
		2696	our @ISA = CFClient::UI::VBox::;
		2697
		2698	sub reorder {
		2699	my ($self) = @_;
		2700	my $NOW = time;
		2701
		2702	while (my ($k, $v) = each %{ $self->{item} }) {
		2703	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2704	}
		2705
		2706	my @widgets;
		2707
		2708	my @items = sort {
		2709	$a->{pri} <=> $b->{pri}
		2710	or $b->{id} <=> $a->{id}
		2711	} values %{ $self->{item} };
		2712
		2713	my $count = 10 + 1;
		2714	for my $item (@items) {
		2715	last unless --$count;
		2716
		2717	push @widgets, $item->{label} ||= do {
		2718	# TODO: doesn't handle markup well (read as: at all)
		2719	my $short = $item->{count} > 1
		2720	? "<b>$item->{count} ×</b> $item->{text}"
		2721	: $item->{text};
		2722
		2723	for ($short) {
		2724	s/^\s+//;
		2725	s/\s+/ /g;
		2726	my $len = int 40 / $item->{fontsize};
		2727	substr $_, $len, length, "…" if $len < length;
		2728	}
		2729
		2730	new CFClient::UI::Label
		2731	markup => $short,
		2732	tooltip => $item->{tooltip},
		2733	tooltip_font => $::FONT_PROP,
		2734	tooltip_width => 0.67,
		2735	fontsize => $item->{fontsize},
		2736	fg => $item->{fg},
		2737	can_events => 1,
		2738	can_hover => 1
		2739	};
		2740	}
		2741
		2742	$self->clear;
		2743	$self->SUPER::add (reverse @widgets);
		2744	}
		2745
		2746	sub add {
		2747	my ($self, $text, %arg) = @_;
		2748
		2749	$text =~ s/^\s+//;
		2750	$text =~ s/\s+$//;
		2751
		2752	my $timeout = time + ((delete $arg{timeout}) || 60);
		2753
		2754	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2755
		2756	if (my $item = $self->{item}{$group}) {
		2757	if ($item->{text} eq $text) {
		2758	$item->{count}++;
		2759	} else {
		2760	$item->{count} = 1;
		2761	$item->{text} = $item->{tooltip} = $text;
		2762	}
		2763	$item->{id} = ++$self->{id};
		2764	$item->{timeout} = $timeout;
		2765	delete $item->{label};
		2766	} else {
		2767	$self->{item}{$group} = {
		2768	id => ++$self->{id},
		2769	text => $text,
		2770	timeout => $timeout,
		2771	tooltip => $text,
		2772	fontsize => 0.8,
		2773	fg => [0.8, 0.8, 0.8, 0.8],
		2774	pri => 0,
		2775	count => 1,
		2776	%arg,
		2777	};
		2778	}
		2779
		2780	$self->reorder;
		2781	}
		2782
		2783	#############################################################################
		2784
2134	package CFClient::UI::Root;	2785	package CFClient::UI::Root;
2135		2786
2136	our @ISA = CFClient::UI::Container::;	2787	our @ISA = CFClient::UI::Container::;
2137		2788
2138	use CFClient::OpenGL;	2789	use CFClient::OpenGL;
2139		2790
2140	sub check_size {	2791	sub new {
2141	my ($self) = @_;	2792	my $class = shift;
2142		2793
2143	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2794	$class->SUPER::new (
2144	}	2795	@_,
2145		2796	)
2146	sub size_request {
2147	($::WIDTH, $::HEIGHT)
2148	}	2797	}
2149		2798
2150	sub configure {	2799	sub configure {
2151	my ($self, $x, $y, $w, $h) = @_;	2800	my ($self, $x, $y, $w, $h) = @_;
2152		2801
2153	$self->SUPER::configure ($x, $y, $w, $h);	2802	$self->{w} = $w;
		2803	$self->{h} = $h;
		2804	}
2154		2805
		2806	sub check_size {
		2807	my ($self) = @_;
		2808
		2809	$self->size_allocate ($self->{w}, $self->{h})
		2810	if $self->{w};
		2811	}
		2812
		2813	sub size_request {
		2814	my ($self) = @_;
		2815
		2816	($self->{w}, $self->{h})
		2817	}
		2818
		2819	sub size_allocate {
		2820	my ($self, $w, $h) = @_;
		2821
		2822	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2823	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2824
		2825	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2826	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2827
2155	for my $child (@{$self->{children}}) {	2828	for my $child ($self->children) {
2156	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2829	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2157		2830
		2831	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2832	if exists $child->{req_x};
		2833
		2834	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2835	if exists $child->{req_y};
		2836
2158	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2837	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2159	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2838	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2839
2160	$child->configure ($X, $Y, $W,$H);	2840	$child->configure ($X, $Y, $W, $H);
2161	}	2841	}
2162	}	2842	}
2163		2843
2164	sub _topleft {	2844	sub coord2local {
2165	my ($self, $x, $y) = @_;	2845	my ($self, $x, $y) = @_;
2166		2846
2167	($x, $y)	2847	($x, $y)
2168	}	2848	}
2169		2849
		2850	sub coord2global {
		2851	my ($self, $x, $y) = @_;
		2852
		2853	($x, $y)
		2854	}
		2855
2170	sub update {	2856	sub update {
2171	my ($self) = @_;	2857	my ($self) = @_;
2172		2858
2173	$self->check_size;	2859	$self->check_size;
2174	::refresh ();	2860	$::WANT_REFRESH++;
2175	}	2861	}
2176		2862
2177	sub add {	2863	sub add {
2178	my ($self, $child) = @_;	2864	my ($self, @children) = @_;
2179		2865
		2866	for my $child (@children) {
		2867	$child->{toplevel} = 1;
		2868
2180	# integerize window positions	2869	# integerise window positions
2181	$child->{x} = int $child->{x};	2870	$child->{x} = int $child->{x};
2182	$child->{y} = int $child->{y};	2871	$child->{y} = int $child->{y};
		2872	}
2183		2873
2184	$self->SUPER::add ($child);	2874	$self->SUPER::add (@children);
2185	}	2875	}
2186		2876
2187	sub on_refresh {	2877	sub on_refresh {
2188	my ($self, $id, $cb) = @_;	2878	my ($self, $id, $cb) = @_;
2189		2879
2190	$self->{refresh_hook}{$id} = $cb;	2880	$self->{refresh_hook}{$id} = $cb;
2191	}	2881	}
2192		2882
		2883	sub on_post_alloc {
		2884	my ($self, $id, $cb) = @_;
		2885
		2886	$self->{post_alloc_hook}{$id} = $cb;
		2887	}
		2888
2193	sub draw {	2889	sub draw {
2194	my ($self) = @_;	2890	my ($self) = @_;
2195		2891
2196	while (my $rcb = delete $self->{refresh_hook}) {	2892	while ($self->{refresh_hook}) {
2197	$_->() for values %$rcb;	2893	$_->()
		2894	for values %{delete $self->{refresh_hook}};
		2895	}
		2896
		2897	if ($self->{check_size}) {
		2898	my @queue = ([], []);
		2899
		2900	for (;;) {
		2901	if ($self->{check_size}) {
		2902	# heuristic: check containers last
		2903	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2904	for values %{delete $self->{check_size}}
		2905	}
		2906
		2907	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2908
		2909	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2910	? @$widget{qw(user_w user_h)}
		2911	: $widget->size_request;
		2912
		2913	if (delete $widget->{force_alloc}
		2914	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2915	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2916
		2917	$widget->{req_w} = $w;
		2918	$widget->{req_h} = $h;
		2919
		2920	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2921
		2922	$widget->{parent}->check_size
		2923	if $widget->{parent};
		2924	}
		2925	}
		2926	}
		2927
		2928	while ($self->{size_alloc}) {
		2929	for (values %{delete $self->{size_alloc}}) {
		2930	my ($widget, $w, $h) = @$_;
		2931
		2932	$w = 0 if $w < 0;
		2933	$h = 0 if $h < 0;
		2934
		2935	$widget->{w} = $w;
		2936	$widget->{h} = $h;
		2937	$widget->size_allocate ($w, $h);
		2938	$widget->emit (size_allocate => $w, $h);
		2939	}
		2940	}
		2941
		2942	while ($self->{post_alloc_hook}) {
		2943	$_->()
		2944	for values %{delete $self->{post_alloc_hook}};
2198	}	2945	}
2199		2946
2200	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2947	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2202	glClear GL_COLOR_BUFFER_BIT;	2949	glClear GL_COLOR_BUFFER_BIT;
…		…
2213	#############################################################################	2960	#############################################################################
2214		2961
2215	package CFClient::UI;	2962	package CFClient::UI;
2216		2963
2217	$ROOT = new CFClient::UI::Root;	2964	$ROOT = new CFClient::UI::Root;
2218	$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0;	2965	$TOOLTIP = new CFClient::UI::Tooltip;
2219		2966
2220	1	2967	1
2221		2968

Diff Legend

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