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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$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};	178	$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};	179	$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};	180	$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};	181	$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};	182	$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};	183	$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};	184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	185	}
156
157	$widget->reconfigure;
158	}	186	}
		187
		188	reconfigure_widgets;
159	}	189	}
160		190
161	#############################################################################	191	#############################################################################
162		192
163	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
176	can_events => 1,	206	can_events => 1,
177	@_	207	@_
178	}, $class;	208	}, $class;
179		209
180	for (keys %$self) {	210	for (keys %$self) {
181	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
183	}	213	}
184	}	214	}
185		215
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
188	$self	225	$self
		226	}
		227
		228	sub toggle_visibility {
		229	my ($self) = @_;
		230
		231	if ($self->{visible}) {
		232	$self->hide;
		233	} else {
		234	$self->show;
		235	}
189	}	236	}
190		237
191	sub destroy {	238	sub destroy {
192	my ($self) = @_;	239	my ($self) = @_;
193		240
…		…
195	%$self = ();	242	%$self = ();
196	}	243	}
197		244
198	sub show {	245	sub show {
199	my ($self) = @_;	246	my ($self) = @_;
200
201	return if $self->{parent};	247	return if $self->{parent};
202		248
203	$CFClient::UI::ROOT->add ($self);	249	$CFClient::UI::ROOT->add ($self);
204	}	250	}
205		251
206	sub hide {	252	sub show_centered {
207	my ($self) = @_;	253	my ($self) = @_;
		254	return if $self->{parent};
		255
		256	$self->show;
		257
		258	$CFClient::UI::ROOT->on_post_alloc (
		259	"centered $self" => sub {
		260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		261	},
		262	);
		263	}
		264
		265	sub set_invisible {
		266	my ($self) = @_;
		267
		268	return unless $self->{visible};
		269
		270	# broken show/hide model
		271
		272	delete $self->{root};
		273	delete $self->{visible};
208		274
209	undef $GRAB if $GRAB == $self;	275	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	276	undef $HOVER if $HOVER == $self;
		277
		278	CFClient::UI::check_tooltip
		279	if $CFClient::UI::TOOLTIP->{owner} == $self;
		280
		281	$self->focus_out;
		282
		283	$self->emit (visibility_change => 0);
		284	}
		285
		286	sub hide {
		287	my ($self) = @_;
		288
		289	$self->set_invisible;
211		290
212	$self->{parent}->remove ($self)	291	$self->{parent}->remove ($self)
213	if $self->{parent};	292	if $self->{parent};
214	}	293	}
215		294
…		…
285	}	364	}
286		365
287	sub set_tooltip {	366	sub set_tooltip {
288	my ($self, $tooltip) = @_;	367	my ($self, $tooltip) = @_;
289		368
		369	$tooltip =~ s/^\s+//;
		370	$tooltip =~ s/\s+$//;
		371
		372	return if $self->{tooltip} eq $tooltip;
		373
290	$self->{tooltip} = $tooltip;	374	$self->{tooltip} = $tooltip;
291		375
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	376	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	377	delete $CFClient::UI::TOOLTIP->{owner};
294	CFClient::UI::check_tooltip;	378	CFClient::UI::check_tooltip;
…		…
315	return if $FOCUS == $self;	399	return if $FOCUS == $self;
316	return unless $self->{can_focus};	400	return unless $self->{can_focus};
317		401
318	my $focus = $FOCUS; $FOCUS = $self;	402	my $focus = $FOCUS; $FOCUS = $self;
319		403
320	$self->emit (focus_in => $focus);	404	$self->_emit (focus_in => $focus);
321		405
322	$focus->update if $focus;	406	$focus->update if $focus;
323	$FOCUS->update;	407	$FOCUS->update;
324	}	408	}
325		409
…		…
328		412
329	return unless $FOCUS == $self;	413	return unless $FOCUS == $self;
330		414
331	my $focus = $FOCUS; undef $FOCUS;	415	my $focus = $FOCUS; undef $FOCUS;
332		416
333	$self->emit (focus_out => $focus);	417	$self->_emit (focus_out => $focus);
334		418
335	$focus->update if $focus; #?	419	$focus->update if $focus; #?
		420
		421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		422	unless $FOCUS;
336	}	423	}
337		424
338	sub mouse_motion { }	425	sub mouse_motion { }
339	sub button_up { }	426	sub button_up { }
340	sub key_down { }	427	sub key_down { }
341	sub key_up { }	428	sub key_up { }
342		429
343	sub button_down {	430	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	431	my ($self, $ev, $x, $y) = @_;
345		432
346	$self->focus_in;	433	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	467	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	468	glPushMatrix;
382	glColor 1, 1, 0, 1;	469	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	471	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	472	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	473	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	474	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	475	glVertex 0 , $self->{h} - 1;
389	glEnd;	476	glEnd;
390	glPopMatrix;	477	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	478	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	479	}
393	}	480	}
…		…
413	sub set_parent {	500	sub set_parent {
414	my ($self, $parent) = @_;	501	my ($self, $parent) = @_;
415		502
416	Scalar::Util::weaken ($self->{parent} = $parent);	503	Scalar::Util::weaken ($self->{parent} = $parent);
417		504
		505	if ($parent->{visible} || 1) {
		506	$self->{root} = $parent->{root};
		507	$self->{visible} = $parent->{visible} + 1;
		508
		509	$self->emit (visibility_change => 1)
		510	unless $self->{parent}{visible};
		511	}
		512
418	# TODO: req_w _does_change after ->reconfigure	513	# TODO: req_w _does_change after ->reconfigure
419	$self->check_size	514	$self->check_size
420	unless exists $self->{req_w};	515	unless exists $self->{req_w};
		516
		517	$self->show;
421	}	518	}
422		519
423	sub check_size {	520	sub check_size {
424	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
425		522
…		…
438	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
439		536
440	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	538	}
442		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
443	sub emit {	546	sub emit {
444	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
445		548
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
447	}	555	}
448		556
449	sub DESTROY {	557	sub DESTROY {
450	my ($self) = @_;	558	my ($self) = @_;
451		559
…		…
564	delete $child->{parent};	672	delete $child->{parent};
565	$child->hide;	673	$child->hide;
566		674
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		676
569	$self->check_size;	677	$self->check_size (1);
570	$self->update;	678	$self->update;
571	}	679	}
572		680
573	sub clear {	681	sub clear {
574	my ($self) = @_;	682	my ($self) = @_;
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
691		799
692	$self->_render;	800	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	801	};
701	}	802	}
702		803
703	sub _draw {	804	sub _draw {
704	my ($self) = @_;	805	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	809	my $tex = $self->{texture}
709	or return;	810	or return;
710		811
711	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
714		815
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		817
717	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
718	}	819	}
…		…
721		822
722	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
723		824
724	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
725		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
726	sub size_request {	837	sub size_request {
727	my ($self) = @_;	838	my ($self) = @_;
728		839
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		841
732	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
733	}	843	}
734		844
735	sub size_allocate {	845	sub size_allocate {
736	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
737		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
738	$self->update;	852	$self->update;
739	}	853	}
740		854
741	sub set_offset {	855	sub set_offset {
742	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	907	my $class = shift;
794		908
795	my $self;	909	my $self;
796		910
797	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
798	vertical => 1,	912	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	914	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
802	},	916	},
803	;	917	;
804		918
805	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	921	slider => $slider,
808	@_,	922	@_,
809	);	923	);
810		924
811	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	926	$self->add ($self->{vp});
813	$self->add ($self->{slider});	927	$self->add ($self->{slider});
814		928
815	$self	929	$self
		930	}
		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	949	}
817		950
818	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	952	# update viewport offset on scroll
820		953
…		…
874	my $class = shift;	1007	my $class = shift;
875		1008
876	# TODO: user_x, user_y, overwrite moveto?	1009	# TODO: user_x, user_y, overwrite moveto?
877		1010
878	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1014	border => 0.6,
882	toplevel => 1,	1015	is_toplevel => 1,
883	can_events => 1,	1016	can_events => 1,
884	@_	1017	@_
885	);	1018	);
886		1019
887	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1021	align => 0,
…		…
941	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
942		1075
943	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
945		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1084	$self->check_size;
950	};	1085	};
951		1086
952	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
956	$self->{motion} = sub {	1091	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
958		1093
959	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
960		1095
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1099	$self->update;
963	};	1100	};
964	}	1101	}
965	}	1102	}
966		1103
…		…
1028	sub new {	1165	sub new {
1029	my $class = shift;	1166	my $class = shift;
1030		1167
1031	$class->SUPER::new (	1168	$class->SUPER::new (
1032	col_expand => [],	1169	col_expand => [],
1033	@_	1170	@_,
1034	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1176	}
1036		1177
1037	sub add {	1178	sub add {
1038	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1039		1180
1040	$child->set_parent ($self);	1181	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1042		1183
1043	$child->check_size;	1184	$self->check_size (1);
1044	}	1185	}
1045		1186
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1188	sub clear {
1052	my ($self) = @_;	1189	my ($self) = @_;
1053		1190
1054	my @children = $self->children;	1191	my @children = $self->children;
1055	delete $self->{children};	1192	delete $self->{children};
…		…
1057	for (@children) {	1194	for (@children) {
1058	delete $_->{parent};	1195	delete $_->{parent};
1059	$_->hide;	1196	$_->hide;
1060	}	1197	}
1061		1198
		1199	$self->check_size (1);
1062	$self->update;	1200	$self->update;
1063	}	1201	}
1064		1202
1065	sub get_wh {	1203	sub get_wh {
1066	my ($self) = @_;	1204	my ($self) = @_;
…		…
1098	sub size_allocate {	1236	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1100		1238
1101	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1102		1240
1103	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1105		1243
1106	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1297	#bg => none	1435	#bg => none
1298	#active_bg => none	1436	#active_bg => none
1299	#font => default_font	1437	#font => default_font
1300	#text => initial text	1438	#text => initial text
1301	#markup => initial narkup	1439	#markup => initial narkup
		1440	#max_w => maximum pixel width
		1441	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1442	layout => (new CFClient::Layout),
1303	fontsize => 1,	1443	fontsize => 1,
1304	align => -1,	1444	align => -1,
1305	valign => -1,	1445	valign => -1,
1306	padding => 2,	1446	padding => 2,
…		…
1371	sub size_request {	1511	sub size_request {
1372	my ($self) = @_;	1512	my ($self) = @_;
1373		1513
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1514	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1515	$self->{layout}->set_width ($self->{max_w} || -1);
		1516	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1517	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1518	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1519
1378	my ($w, $h) = $self->{layout}->size;	1520	my ($w, $h) = $self->{layout}->size;
1379		1521
1380	if (exists $self->{template}) {	1522	if (exists $self->{template}) {
…		…
1416		1558
1417	my $tex = $self->{texture} ||= do {	1559	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1560	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1561	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1562	$self->{layout}->set_width ($self->{w});
		1563	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1566
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1567	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1568
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1608	active_fg => [0, 0, 0],
1465	can_hover => 1,	1609	can_hover => 1,
1466	can_focus => 1,	1610	can_focus => 1,
1467	valign => 0,	1611	valign => 0,
1468	can_events => 1,	1612	can_events => 1,
		1613	#text => ...
1469	@_	1614	@_
1470	)	1615	)
1471	}	1616	}
1472		1617
1473	sub _set_text {	1618	sub _set_text {
…		…
1483	$self->{text} = $text;	1628	$self->{text} = $text;
1484		1629
1485	$text =~ s/./*/g if $self->{hidden};	1630	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1631	$self->{layout}->set_text ("$text ");
1487		1632
1488	$self->emit (changed => $self->{text});	1633	$self->_emit (changed => $self->{text});
1489	}	1634	}
1490		1635
1491	sub set_text {	1636	sub set_text {
1492	my ($self, $text) = @_;	1637	my ($self, $text) = @_;
1493		1638
…		…
1505	my ($self) = @_;	1650	my ($self) = @_;
1506		1651
1507	my ($w, $h) = $self->SUPER::size_request;	1652	my ($w, $h) = $self->SUPER::size_request;
1508		1653
1509	($w + 1, $h) # add 1 for cursor	1654	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1655	}
1517		1656
1518	sub key_down {	1657	sub key_down {
1519	my ($self, $ev) = @_;	1658	my ($self, $ev) = @_;
1520		1659
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1674	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1675	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1676	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1677	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1678	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1679	$self->_emit ('escape');
1541	} elsif ($uni) {	1680	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1681	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1682	}
1544		1683
1545	$self->_set_text ($text);	1684	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1771	if ($sym == 13) {
1633	unshift @{$self->{history}},	1772	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1773	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1774	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1775	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1776	$self->_emit (activate => $txt);
1638	$self->update;	1777	$self->update;
1639		1778
1640	} elsif ($sym == CFClient::SDLK_UP) {	1779	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1780	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1781	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1829	can_events => 1,
1691	@_	1830	@_
1692	)	1831	)
1693	}	1832	}
1694		1833
		1834	sub activate { }
		1835
1695	sub button_up {	1836	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1697		1838
		1839	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1840	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1841	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1842	}
1703		1843
1704	sub _draw {	1844	sub _draw {
1705	my ($self) = @_;	1845	my ($self) = @_;
1706		1846
…		…
1758	my ($self, $ev, $x, $y) = @_;	1898	my ($self, $ev, $x, $y) = @_;
1759		1899
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1902	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1903	$self->_emit (changed => $self->{state});
1764	}	1904	}
1765	}	1905	}
1766		1906
1767	sub _draw {	1907	sub _draw {
1768	my ($self) = @_;	1908	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2185	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2186	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2187	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2188	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2189	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2190	req_h => $::WIDTH / 80,
2051	vertical => 0,	2191	vertical => 0,
2052	can_hover => 1,	2192	can_hover => 1,
2053	inner_pad => .05,	2193	inner_pad => 0.02,
2054	@_	2194	@_
2055	);	2195	);
2056		2196
2057	$self->set_value ($self->{range}[0]);	2197	$self->set_value ($self->{range}[0]);
2058	$self->update;	2198	$self->update;
2059		2199
2060	$self	2200	$self
2061	}	2201	}
2062		2202
		2203	sub set_range {
		2204	my ($self, $range) = @_;
		2205
		2206	($range, $self->{range}) = ($self->{range}, $range);
		2207
		2208	$self->update
		2209	if "@$range" ne "@{$self->{range}}";
		2210	}
		2211
2063	sub set_value {	2212	sub set_value {
2064	my ($self, $value) = @_;	2213	my ($self, $value) = @_;
2065		2214
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2215	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2216
2068	$hi = $lo + 1 if $hi <= $lo;	2217	$hi = $lo + 1 if $hi <= $lo;
2069		2218
		2219	$page = $hi - $lo if $page > $hi - $lo;
		2220
2070	$value = $lo if $value < $lo;	2221	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2222	$value = $hi - $page if $value > $hi - $page;
2072		2223
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2224	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2225	if $unit;
2075		2226
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2227	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2228
2080	if ($value != $old_value) {	2229	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2230	$self->_emit (changed => $value);
2082	$self->update;	2231	$self->update;
2083	}	2232	}
2084	}	2233	}
2085		2234
2086	sub size_request {	2235	sub size_request {
…		…
2094		2243
2095	sub button_down {	2244	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2097		2246
2098	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::button_down ($ev, $x, $y);
		2248
		2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2250
2099	$self->mouse_motion ($ev, $x, $y);	2251	$self->mouse_motion ($ev, $x, $y);
2100	}	2252	}
2101		2253
2102	sub mouse_motion {	2254	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2257	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2258	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2259
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2260	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2261
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2263
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2265	}
2114	}	2266	}
2115		2267
2116	sub update {	2268	sub update {
2117	my ($self) = @_;	2269	my ($self) = @_;
2118		2270
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2272	$self->set_value ($self->{range}[0]);
2121		2273
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2274	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2275	my $range = ($hi - $page - $lo) || 1e-100;
2123		2276
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2277	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2278
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2279	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2280	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2281
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2282	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2283	$value = $value * $self->{scale} + $self->{offset};
2130		2284
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2285	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2286	$self->{knob_w} = $knob_w;
2138	});	2287	});
2139		2288
2140	$self->SUPER::update;	2289	$self->SUPER::update;
2141	}	2290	}
2142		2291
…		…
2148	glScale $self->{w}, $self->{h};	2297	glScale $self->{w}, $self->{h};
2149		2298
2150	if ($self->{vertical}) {	2299	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2300	# draw a vertical slider like a rotated horizontal slider
2152		2301
		2302	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2303	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2304	}
2156		2305
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2306	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2307	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2308
…		…
2166	# draw handle	2315	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2316	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2317
2169	glDisable GL_TEXTURE_2D;	2318	glDisable GL_TEXTURE_2D;
2170	}	2319	}
		2320
		2321	#############################################################################
		2322
		2323	package CFClient::UI::ValSlider;
		2324
		2325	our @ISA = CFClient::UI::HBox::;
		2326
		2327	sub new {
		2328	my ($class, %arg) = @_;
		2329
		2330	my $range = delete $arg{range};
		2331
		2332	my $self = $class->SUPER::new (
		2333	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2334	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2335	to_value => sub { shift },
		2336	from_value => sub { shift },
		2337	%arg,
		2338	);
		2339
		2340	$self->{slider}->connect (changed => sub {
		2341	my ($self, $value) = @_;
		2342	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2343	$self->{parent}->emit (changed => $value);
		2344	});
		2345
		2346	# $self->{entry}->connect (changed => sub {
		2347	# my ($self, $value) = @_;
		2348	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2349	# $self->{parent}->emit (changed => $value);
		2350	# });
		2351
		2352	$self->add ($self->{slider}, $self->{entry});
		2353
		2354	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2355
		2356	$self
		2357	}
		2358
		2359	sub set_range { shift->{slider}->set_range (@_) }
		2360	sub set_value { shift->{slider}->set_value (@_) }
2171		2361
2172	#############################################################################	2362	#############################################################################
2173		2363
2174	package CFClient::UI::TextView;	2364	package CFClient::UI::TextView;
2175		2365
…		…
2205		2395
2206	$self->{fontsize} = $fontsize;	2396	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2397	$self->reflow;
2208	}	2398	}
2209		2399
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2400	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2401	my ($self, $w, $h) = @_;
2231		2402
2232	$self->SUPER::size_allocate ($w, $h);	2403	$self->SUPER::size_allocate ($w, $h);
2233		2404
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2407	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2408
2238	$self->reflow;	2409	$self->reflow;
2239	}	2410	}
2240		2411
		2412	sub text_size {
		2413	my ($self, $text, $indent) = @_;
		2414
		2415	my $layout = $self->{layout};
		2416
		2417	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2418	$layout->set_width ($self->{children}[0]{w} - $indent);
		2419	$layout->set_markup ($text);
		2420
		2421	$layout->size
		2422	}
		2423
		2424	sub reflow {
		2425	my ($self) = @_;
		2426
		2427	$self->{need_reflow}++;
		2428	$self->update;
		2429	}
		2430
		2431	sub set_offset {
		2432	my ($self, $offset) = @_;
		2433
		2434	# todo: base offset on lines or so, not on pixels
		2435	$self->{children}[1]->set_value ($offset);
		2436	}
		2437
		2438	sub clear {
		2439	my ($self) = @_;
		2440
		2441	$self->{par} = [];
		2442	$self->{height} = 0;
		2443	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2444	}
		2445
2241	sub add_paragraph {	2446	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2447	my ($self, $color, $text, $indent) = @_;
2243		2448
2244	#TODO: intelligently "reformat" paragraph	2449	for my $line (split /\n/, $text) {
2245		2450	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2451	$self->{height} += $h;
		2452	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2453	}
2249		2454
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2455	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2456	}
2255		2457
2256	sub update {	2458	sub update {
2257	my ($self) = @_;	2459	my ($self) = @_;
2258		2460
…		…
2261	return unless $self->{h} > 0;	2463	return unless $self->{h} > 0;
2262		2464
2263	delete $self->{texture};	2465	delete $self->{texture};
2264		2466
2265	$ROOT->on_post_alloc ($self, sub {	2467	$ROOT->on_post_alloc ($self, sub {
		2468	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2469
2266	if (delete $self->{need_reflow}) {	2470	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2471	my $height = 0;
2268		2472
2269	$height += $_->[0] = $self->text_height ($_->[2])	2473	my $layout = $self->{layout};
		2474
		2475	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2476
2270	for @{$self->{par}};	2477	for (@{$self->{par}}) {
		2478	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2479	$layout->set_width ($W - $_->[3]);
		2480	$layout->set_markup ($_->[4]);
		2481	my ($w, $h) = $layout->size;
		2482	$_->[0] = $w + $_->[3];
		2483	$_->[1] = $h;
		2484	}
		2485
		2486	$height += $_->[1];
		2487	}
2271		2488
2272	$self->{height} = $height;	2489	$self->{height} = $height;
2273		2490
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2491	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2492
2276	delete $self->{texture};	2493	delete $self->{texture};
2277	}	2494	}
2278		2495
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2496	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2497	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2498	glClear GL_COLOR_BUFFER_BIT;
2282		2499
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2500	my $top = int $self->{children}[1]{range}[0];
2287		2501
2288	my $y0 = $top;	2502	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2503	my $y1 = $top + $H;
2290		2504
2291	my $y = 0;	2505	my $y = 0;
2292		2506
2293	my $layout = $self->{layout};	2507	my $layout = $self->{layout};
2294		2508
2295	$layout->set_font ($self->{font}) if $self->{font};	2509	$layout->set_font ($self->{font}) if $self->{font};
2296		2510
		2511	glEnable GL_BLEND;
		2512	#TODO# not correct in windows where rgba is forced off
		2513	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2514
2297	for my $par (@{$self->{par}}) {	2515	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2516	my $h = $par->[1];
2299		2517
2300	if ($y0 < $y + $h && $y < $y1) {	2518	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2519	$layout->set_foreground (@{ $par->[2] });
		2520	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2521	$layout->set_markup ($par->[4]);
2303		2522
2304	my ($W, $H) = $layout->size;	2523	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2524
		2525	glRasterPos $par->[3], $y - $y0;
		2526	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2527	}
2307		2528
2308	$y += $h;	2529	$y += $h;
2309	}	2530	}
2310		2531
2311	glDisable GL_TEXTURE_2D;	2532	glDisable GL_BLEND;
2312	};	2533	};
2313	});	2534	});
2314	}	2535	}
2315		2536
2316	sub _draw {	2537	sub _draw {
2317	my ($self) = @_;	2538	my ($self) = @_;
2318		2539
2319	glEnable GL_TEXTURE_2D;	2540	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2542	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2543	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2324		2545
2325	$self->{children}[1]->draw;	2546	$self->{children}[1]->draw;
2326		2547
2327	}	2548	}
…		…
2376		2597
2377	sub new {	2598	sub new {
2378	my $class = shift;	2599	my $class = shift;
2379		2600
2380	my $self = $class->SUPER::new (	2601	my $self = $class->SUPER::new (
2381	state => 0,	2602	state => 0,
2382	connect_activate => \&toggle_flopper,	2603	on_activate => \&toggle_flopper,
2383	@_	2604	@_
2384	);	2605	);
2385		2606
2386	if ($self->{state}) {
2387	$self->{state} = 0;
2388	$self->toggle_flopper;
2389	}
2390
2391	$self	2607	$self
2392	}	2608	}
2393		2609
2394	sub toggle_flopper {	2610	sub toggle_flopper {
2395	my ($self) = @_;	2611	my ($self) = @_;
2396		2612
2397	# TODO: use animation	2613	$self->{other}->toggle_visibility;
2398	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");
2402	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");
2405	}
2406
2407	$self->emit (changed => $self->{state});
2408	}	2614	}
2409		2615
2410	#############################################################################	2616	#############################################################################
2411		2617
2412	package CFClient::UI::Tooltip;	2618	package CFClient::UI::Tooltip;
…		…
2426		2632
2427	sub set_tooltip_from {	2633	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2634	my ($self, $widget) = @_;
2429		2635
2430	$self->add (new CFClient::UI::Label	2636	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2637	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2639	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2640	fg => [0, 0, 0, 1],
		2641	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2642	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2643	);
2437	}	2644	}
2438		2645
2439	sub size_request {	2646	sub size_request {
2440	my ($self) = @_;	2647	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2487		2694
2488	sub new {	2695	sub new {
2489	my $class = shift;	2696	my $class = shift;
2490		2697
2491	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2492	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2493	@_,	2701	@_,
2494	)	2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
2495	}	2719	}
2496		2720
2497	sub size_request {	2721	sub size_request {
2498	(32, 8)	2722	(32, 8)
2499	}	2723	}
2500		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2501	sub _draw {	2733	sub _draw {
2502	my ($self) = @_;	2734	my ($self) = @_;
2503		2735
2504	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2748
2507	# TODO animation
2508	if ($tex) {	2749	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2514	}	2755	}
2515	}	2756	}
2516		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
2517	#############################################################################	2767	#############################################################################
2518		2768
2519	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2520		2770
2521	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2522
2523	sub _item_to_desc {
2524	my ($item) = @_;
2525
2526	my $desc =
2527	$item->{nrof} < 2
2528	? $item->{name}
2529	: "$item->{nrof} $item->{name_pl}";
2530
2531	$item->{flags} & Crossfire::Protocol::F_OPEN
2532	and $desc .= " (open)";
2533	$item->{flags} & Crossfire::Protocol::F_APPLIED
2534	and $desc .= " (applied)";
2535	$item->{flags} & Crossfire::Protocol::F_UNPAID
2536	and $desc .= " (unpaid)";
2537	$item->{flags} & Crossfire::Protocol::F_MAGIC
2538	and $desc .= " (magic)";
2539	$item->{flags} & Crossfire::Protocol::F_CURSED
2540	and $desc .= " (cursed)";
2541	$item->{flags} & Crossfire::Protocol::F_DAMNED
2542	and $desc .= " (damned)";
2543	$item->{flags} & Crossfire::Protocol::F_LOCKED
2544	and $desc .= " *";
2545
2546	$desc
2547	}
2548		2772
2549	sub new {	2773	sub new {
2550	my $class = shift;	2774	my $class = shift;
2551		2775
2552	my %args = @_;
2553
2554	my $item = delete $args{item};
2555
2556	my $desc = _item_to_desc ($item);
2557
2558	my $self = $class->SUPER::new (	2776	my $self = $class->SUPER::new (
2559	can_hover => 1,	2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2560	can_events => 1,
2561	tooltip => ((CFClient::UI::Label::escape $desc)
2562	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563	connect_button_down => sub {
2564	my ($self, $ev, $x, $y) = @_;
2565
2566	# todo: maybe put examine on 1? but should just be a tooltip :(
2567	if ($ev->{button} == 1) {
2568	my $targ = $::CONN->{player}{tag};
2569
2570	if ($item->{container} == $::CONN->{player}{tag}) {
2571	$targ = $main::OPENCONT;
2572	}
2573
2574	$::CONN->send ("move $targ $item->{tag} 0");
2575	} elsif ($ev->{button} == 2) {
2576	$::CONN->send ("apply $item->{tag}");
2577	} elsif ($ev->{button} == 3) {
2578	my @menu_items = (
2579	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583	[
2584	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585	sub { $::CONN->send ("lock $item->{tag}") },
2586	],
2587	);
2588
2589	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590	}
2591
2592	1
2593	},
2594	%args
2595	);
2596
2597
2598	$self->add (new CFClient::UI::Face
2599	can_events => 0,
2600	face => $item->{face},
2601	anim => $item->{anim},
2602	animspeed => $item->{animspeed},
2603	);
2604
2605	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607	$self->{item} = $item;
2608
2609	$self->update_item;
2610
2611	$self
2612	}
2613
2614	sub update_item {
2615	my ($self) = @_;
2616
2617	my $desc = _item_to_desc ($self->{item});
2618
2619	$self->{name_lbl}->set_text ($desc);
2620	}
2621
2622	#############################################################################
2623
2624	package CFClient::UI::Inventory;
2625
2626	our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628	sub new {
2629	my $class = shift;
2630
2631	my $self = $class->SUPER::new (
2632	scrolled => (new CFClient::UI::VBox),
2633	@_,	2778	@_,
2634	);	2779	);
2635		2780
2636	$self	2781	$self
2637	}	2782	}
…		…
2647	or ($a->{name} cmp $b->{name})	2792	or ($a->{name} cmp $b->{name})
2648	} @$items;	2793	} @$items;
2649		2794
2650	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2651		2796
		2797	my $row = 0;
2652	for my $item (@items) {	2798	for my $item (@items) {
2653	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2799	CFClient::Item::update_widgets $item;
2654	$item->update_item ();
2655	}
2656		2800
2657	$self->{scrolled}->add (@items);	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2658		2804
2659	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2805	$row++;
		2806	}
2660	}	2807	}
2661		2808
2662	sub size_request {	2809	sub size_request {
2663	my ($self) = @_;	2810	my ($self) = @_;
2664	($self->{req_w}, $self->{req_h});	2811	($self->{req_w}, $self->{req_h});
…		…
2704		2851
2705	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2706	sub popup {	2853	sub popup {
2707	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2708		2855
2709	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2710		2857
2711	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2712	$GRAB = $self;	2859	$GRAB = $self;
2713	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2714		2861
…		…
2729		2876
2730	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2731	undef $GRAB;	2878	undef $GRAB;
2732	$self->hide;	2879	$self->hide;
2733		2880
2734	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2735	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2736	}	2883	}
2737	}	2884	}
2738		2885
2739	#############################################################################	2886	#############################################################################
…		…
2774	# TODO: doesn't handle markup well (read as: at all)	2921	# TODO: doesn't handle markup well (read as: at all)
2775	my $short = $item->{count} > 1	2922	my $short = $item->{count} > 1
2776	? "<b>$item->{count} ×</b> $item->{text}"	2923	? "<b>$item->{count} ×</b> $item->{text}"
2777	: $item->{text};	2924	: $item->{text};
2778		2925
2779	my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781	for ($short) {	2926	for ($short) {
2782	s/^\s+//;	2927	s/^\s+//;
2783	s/\s+/ /g;	2928	s/\s+/ /g;
2784	my $len = int 40 / $fontsize;
2785	substr $_, $len, length, "…" if $len < length;
2786	}	2929	}
2787		2930
2788	new CFClient::UI::Label	2931	new CFClient::UI::Label
2789	markup => $short,	2932	markup => $short,
2790	tooltip => $item->{tooltip},	2933	tooltip => $item->{tooltip},
2791	tooltip_font => $::FONT_PROP,	2934	tooltip_font => $::FONT_PROP,
2792	tooltip_width => 0.67,	2935	tooltip_width => 0.67,
2793	fontsize => $fontsize,	2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
2794	fg => $item->{fg},	2938	fg => $item->{fg},
2795	can_events => 1,	2939	can_events => 1,
2796	can_hover => 1	2940	can_hover => 1
2797	};	2941	};
2798	}	2942	}
…		…
2804	sub add {	2948	sub add {
2805	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2806		2950
2807	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2809		2955
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2957
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2959
…		…
2835	}	2981	}
2836		2982
2837	$self->reorder;	2983	$self->reorder;
2838	}	2984	}
2839		2985
		2986	sub reconfigure {
		2987	my ($self) = @_;
		2988
		2989	delete $_->{label}
		2990	for values %{ $self->{item} || {} };
		2991
		2992	$self->reorder;
		2993	$self->SUPER::reconfigure;
		2994	}
		2995
2840	#############################################################################	2996	#############################################################################
2841		2997
2842	package CFClient::UI::Root;	2998	package CFClient::UI::Root;
2843		2999
2844	our @ISA = CFClient::UI::Container::;	3000	our @ISA = CFClient::UI::Container::;
…		…
2847		3003
2848	sub new {	3004	sub new {
2849	my $class = shift;	3005	my $class = shift;
2850		3006
2851	$class->SUPER::new (	3007	$class->SUPER::new (
		3008	visible => 1,
2852	@_,	3009	@_,
2853	)	3010	)
2854	}	3011	}
2855		3012
2856	sub configure {	3013	sub configure {
…		…
2874	}	3031	}
2875		3032
2876	sub size_allocate {	3033	sub size_allocate {
2877	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h) = @_;
2878		3035
2879	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885	for my $child ($self->children) {	3036	for my $child ($self->children) {
2886	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887		3038
2888	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889	if exists $child->{req_x};	3040	if exists $child->{req_x};
2890		3041
2891	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892	if exists $child->{req_y};	3043	if exists $child->{req_y};
2893		3044
		3045	$X = $self->{user_x} if exists $self->{user_x};
		3046	$Y = $self->{user_y} if exists $self->{user_y};
		3047
2894	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896		3050
2897	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2898	}	3052	}
…		…
2918	}	3072	}
2919		3073
2920	sub add {	3074	sub add {
2921	my ($self, @children) = @_;	3075	my ($self, @children) = @_;
2922		3076
		3077	for (my @widgets = @children; my $w = pop @widgets; ) {
		3078	push @widgets, $w->children;
		3079	$w->{root} = $self;
		3080	$w->{visible} = $self->{visible} + 1;
		3081	}
		3082
2923	for my $child (@children) {	3083	for my $child (@children) {
2924	$child->{toplevel} = 1;	3084	$child->{is_toplevel} = 1;
2925		3085
2926	# integerise window positions	3086	# integerise window positions
2927	$child->{x} = int $child->{x};	3087	$child->{x} = int $child->{x};
2928	$child->{y} = int $child->{y};	3088	$child->{y} = int $child->{y};
2929	}	3089	}
2930		3090
2931	$self->SUPER::add (@children);	3091	$self->SUPER::add (@children);
2932	}	3092	}
2933		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	$w->set_invisible;
		3103	}
		3104	}
		3105
2934	sub on_refresh {	3106	sub on_refresh {
2935	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2936		3108
2937	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2938	}	3110	}
…		…
2950	$_->()	3122	$_->()
2951	for values %{delete $self->{refresh_hook}};	3123	for values %{delete $self->{refresh_hook}};
2952	}	3124	}
2953		3125
2954	if ($self->{check_size}) {	3126	if ($self->{check_size}) {
2955	my @queue = ([], []);	3127	my @queue;
2956		3128
2957	for (;;) {	3129	for (;;) {
2958	if ($self->{check_size}) {	3130	if ($self->{check_size}) {
2959	# heuristic: check containers last	3131	#TODO use array-of-depth approach
2960	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
		3133	@queue = sort { $a->{visible} <=> $b->{visible} }
2961	for values %{delete $self->{check_size}}	3134	@queue, values %{delete $self->{check_size}};
2962	}	3135	}
2963		3136
2964	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3137	my $widget = pop @queue || last;
		3138
		3139	defined $widget->{visible} or last; # do not resize invisible widgets
2965		3140
2966	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967	? @$widget{qw(user_w user_h)}	3142	? @$widget{qw(user_w user_h)}
2968	: $widget->size_request;	3143	: $widget->size_request;
2969		3144
…		…
2989	$w = 0 if $w < 0;	3164	$w = 0 if $w < 0;
2990	$h = 0 if $h < 0;	3165	$h = 0 if $h < 0;
2991		3166
2992	$widget->{w} = $w;	3167	$widget->{w} = $w;
2993	$widget->{h} = $h;	3168	$widget->{h} = $h;
2994	$widget->size_allocate ($w, $h);
2995	$widget->emit (size_allocate => $w, $h);	3169	$widget->emit (size_allocate => $w, $h);
2996	}	3170	}
2997	}	3171	}
2998		3172
2999	while ($self->{post_alloc_hook}) {	3173	while ($self->{post_alloc_hook}) {
…		…
3005	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006	glClear GL_COLOR_BUFFER_BIT;	3180	glClear GL_COLOR_BUFFER_BIT;
3007		3181
3008	glMatrixMode GL_PROJECTION;	3182	glMatrixMode GL_PROJECTION;
3009	glLoadIdentity;	3183	glLoadIdentity;
3010	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011	glMatrixMode GL_MODELVIEW;	3185	glMatrixMode GL_MODELVIEW;
3012	glLoadIdentity;	3186	glLoadIdentity;
3013		3187
3014	$self->_draw;	3188	$self->_draw;
3015	}	3189	}
…		…
3017	#############################################################################	3191	#############################################################################
3018		3192
3019	package CFClient::UI;	3193	package CFClient::UI;
3020		3194
3021	$ROOT = new CFClient::UI::Root;	3195	$ROOT = new CFClient::UI::Root;
3022	$TOOLTIP = new CFClient::UI::Tooltip;	3196	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023		3197
3024	1	3198	1
3025		3199

Diff Legend

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