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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 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	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
150	$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};
151	$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};
152	$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};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158	}	183	}
159
160	$widget->reconfigure;
161	}	184	}
		185
		186	reconfigure_widgets;
162	}	187	}
163		188
164	#############################################################################	189	#############################################################################
165		190
166	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
179	can_events => 1,	204	can_events => 1,
180	@_	205	@_
181	}, $class;	206	}, $class;
182		207
183	for (keys %$self) {	208	for (keys %$self) {
184	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
186	}	211	}
187	}	212	}
188		213
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
191	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
192	}	234	}
193		235
194	sub destroy {	236	sub destroy {
195	my ($self) = @_;	237	my ($self) = @_;
196		238
…		…
198	%$self = ();	240	%$self = ();
199	}	241	}
200		242
201	sub show {	243	sub show {
202	my ($self) = @_;	244	my ($self) = @_;
203
204	return if $self->{parent};	245	return if $self->{parent};
205		246
206	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
207	}	248	}
208		249
209	sub hide {	250	sub center {
210	my ($self) = @_;	251	my ($self) = @_;
		252
		253	$CFClient::UI::ROOT->on_post_alloc (
		254	"center_$self" => sub {
		255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		256	},
		257	);
		258
		259	$self->update;
		260	}
		261
		262	sub set_visible {
		263	my ($self) = @_;
		264
		265	return if $self->{visible};
		266
		267	$self->{root} = $self->{parent}{root};
		268	$self->{visible} = $self->{parent}{visible} + 1;
		269
		270	$self->emit (visibility_change => 1)
		271	}
		272
		273	sub set_invisible {
		274	my ($self) = @_;
		275
		276	return unless $self->{visible};
		277
		278	# broken show/hide model
		279
		280	delete $self->{root};
		281	delete $self->{visible};
211		282
212	undef $GRAB if $GRAB == $self;	283	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	284	undef $HOVER if $HOVER == $self;
		285
		286	CFClient::UI::check_tooltip
		287	if $CFClient::UI::TOOLTIP->{owner} == $self;
		288
		289	$self->focus_out;
		290
		291	$self->emit (visibility_change => 0);
		292	}
		293
		294	sub hide {
		295	my ($self) = @_;
		296
		297	$self->set_invisible;
214		298
215	$self->{parent}->remove ($self)	299	$self->{parent}->remove ($self)
216	if $self->{parent};	300	if $self->{parent};
217	}	301	}
218		302
…		…
227	}	311	}
228		312
229	sub set_size {	313	sub set_size {
230	my ($self, $w, $h) = @_;	314	my ($self, $w, $h) = @_;
231		315
232	$self->{user_w} = $w;	316	$self->{def_w} = $w;
233	$self->{user_h} = $h;	317	$self->{def_h} = $h;
234		318
235	$self->check_size;	319	$self->check_size;
236	}	320	}
237		321
238	sub size_request {	322	sub size_request {
…		…
288	}	372	}
289		373
290	sub set_tooltip {	374	sub set_tooltip {
291	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
292		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
		381
293	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
294		383
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
297	CFClient::UI::check_tooltip;	386	CFClient::UI::check_tooltip;
…		…
318	return if $FOCUS == $self;	407	return if $FOCUS == $self;
319	return unless $self->{can_focus};	408	return unless $self->{can_focus};
320		409
321	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
322		411
323	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
324		413
325	$focus->update if $focus;	414	$focus->update if $focus;
326	$FOCUS->update;	415	$FOCUS->update;
327	}	416	}
328		417
…		…
331		420
332	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
333		422
334	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
335		424
336	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
337		426
338	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
339	}	431	}
340		432
341	sub mouse_motion { }	433	sub mouse_motion { }
342	sub button_up { }	434	sub button_up { }
343	sub key_down { }	435	sub key_down { }
344	sub key_up { }	436	sub key_up { }
345		437
346	sub button_down {	438	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
348		440
349	$self->focus_in;	441	$self->focus_in;
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	475	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	476	glPushMatrix;
385	glColor 1, 1, 0, 1;	477	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	479	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	480	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	481	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	482	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	483	glVertex 0 , $self->{h} - 1;
392	glEnd;	484	glEnd;
393	glPopMatrix;	485	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	486	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	487	}
396	}	488	}
…		…
416	sub set_parent {	508	sub set_parent {
417	my ($self, $parent) = @_;	509	my ($self, $parent) = @_;
418		510
419	Scalar::Util::weaken ($self->{parent} = $parent);	511	Scalar::Util::weaken ($self->{parent} = $parent);
420		512
421	# TODO: req_w _does_change after ->reconfigure	513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		514
422	$self->check_size	515	$self->check_size;
423	unless exists $self->{req_w};
424	}	516	}
425		517
426	sub check_size {	518	sub check_size {
427	my ($self, $forced) = @_;	519	my ($self, $forced) = @_;
428		520
…		…
441	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
442		534
443	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}	536	}
445		537
		538	sub _emit {
		539	my ($self, $signal, @args) = @_;
		540
		541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		542	}
		543
446	sub emit {	544	sub emit {
447	my ($self, $signal, @args) = @_;	545	my ($self, $signal, @args) = @_;
448		546
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	547	$self->_emit ($signal, @args)
		548	|| $self->$signal (@args);
		549	}
		550
		551	sub visibility_change {
		552	#my ($self, $visible) = @_;
450	}	553	}
451		554
452	sub DESTROY {	555	sub DESTROY {
453	my ($self) = @_;	556	my ($self) = @_;
454		557
…		…
567	delete $child->{parent};	670	delete $child->{parent};
568	$child->hide;	671	$child->hide;
569		672
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		674
572	$self->check_size;	675	$self->check_size (1);
573	$self->update;	676	$self->update;
574	}	677	}
575		678
576	sub clear {	679	sub clear {
577	my ($self) = @_;	680	my ($self) = @_;
…		…
691	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	794	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692	glClearColor 0, 0, 0, 0;	795	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	796	glClear GL_COLOR_BUFFER_BIT;
694		797
695	$self->_render;	798	$self->_render;
696	# glColorMask 1, 1, 1, 0;
697	# glEnable GL_BLEND;
698	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699	# glRasterPos 0, 0;
700	# glCopyPixels 0, 0, $self->{w}, $self->{h};
701	# glDisable GL_BLEND;
702	# glColorMask 1, 1, 1, 1;
703	};	799	};
704	}	800	}
705		801
706	sub _draw {	802	sub _draw {
707	my ($self) = @_;	803	my ($self) = @_;
…		…
711	my $tex = $self->{texture}	807	my $tex = $self->{texture}
712	or return;	808	or return;
713		809
714	glEnable GL_TEXTURE_2D;	810	glEnable GL_TEXTURE_2D;
715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716	glColor 0, 0, 0, 1;	812	glColor 1, 1, 1, 1;
717		813
718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	814	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719		815
720	glDisable GL_TEXTURE_2D;	816	glDisable GL_TEXTURE_2D;
721	}	817	}
…		…
724		820
725	package CFClient::UI::ViewPort;	821	package CFClient::UI::ViewPort;
726		822
727	our @ISA = CFClient::UI::Window::;	823	our @ISA = CFClient::UI::Window::;
728		824
		825	sub new {
		826	my $class = shift;
		827
		828	$class->SUPER::new (
		829	scroll_x => 0,
		830	scroll_y => 1,
		831	@_,
		832	)
		833	}
		834
729	sub size_request {	835	sub size_request {
730	my ($self) = @_;	836	my ($self) = @_;
731		837
732	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	838	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
733	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
734		839
735	@$self{qw(child_w child_h)}	840	$w = 10 if $self->{scroll_x};
		841	$h = 10 if $self->{scroll_y};
		842
		843	($w, $h)
736	}	844	}
737		845
738	sub size_allocate {	846	sub size_allocate {
739	my ($self, $w, $h) = @_;	847	my ($self, $w, $h) = @_;
740		848
		849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		851
		852	$self->child->configure (0, 0, $w, $h);
741	$self->update;	853	$self->update;
742	}	854	}
743		855
744	sub set_offset {	856	sub set_offset {
745	my ($self, $x, $y) = @_;	857	my ($self, $x, $y) = @_;
…		…
796	my $class = shift;	908	my $class = shift;
797		909
798	my $self;	910	my $self;
799		911
800	my $slider = new CFClient::UI::Slider	912	my $slider = new CFClient::UI::Slider
801	vertical => 1,	913	vertical => 1,
802	range => [0, 0, 1, 0.01], # HACK fix	914	range => [0, 0, 1, 0.01], # HACK fix
803	connect_changed => sub {	915	on_changed => sub {
804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	916	$self->{vp}->set_offset (0, $_[1]);
805	},	917	},
806	;	918	;
807		919
808	$self = $class->SUPER::new (	920	$self = $class->SUPER::new (
809	vp => (new CFClient::UI::ViewPort),	921	vp => (new CFClient::UI::ViewPort expand => 1),
810	slider => $slider,	922	slider => $slider,
811	@_,	923	@_,
812	);	924	);
813		925
814	$self->{vp}->add ($self->{scrolled});	926	$self->{vp}->add ($self->{scrolled});
815	$self->add ($self->{vp});	927	$self->add ($self->{vp});
816	$self->add ($self->{slider});	928	$self->add ($self->{slider});
817		929
818	$self	930	$self
		931	}
		932
		933	sub update {
		934	my ($self) = @_;
		935
		936	$self->SUPER::update;
		937
		938	# todo: overwrite size_allocate of child
		939	my $child = $self->{vp}->child;
		940	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		941	}
		942
		943	sub size_allocate {
		944	my ($self, $w, $h) = @_;
		945
		946	$self->SUPER::size_allocate ($w, $h);
		947
		948	my $child = $self->{vp}->child;
		949	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819	}	950	}
820		951
821	#TODO# update range on size_allocate depending on child	952	#TODO# update range on size_allocate depending on child
822	# update viewport offset on scroll	953	# update viewport offset on scroll
823		954
…		…
874	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875		1006
876	sub new {	1007	sub new {
877	my $class = shift;	1008	my $class = shift;
878		1009
879	# TODO: user_x, user_y, overwrite moveto?
880
881	my $self = $class->SUPER::new (	1010	my $self = $class->SUPER::new (
882	bg => [1, 1, 1, 1],	1011	bg => [1, 1, 1, 1],
883	border_bg => [1, 1, 1, 1],	1012	border_bg => [1, 1, 1, 1],
884	border => 0.6,	1013	border => 0.6,
885	toplevel => 1,	1014	is_toplevel => 1,
886	can_events => 1,	1015	can_events => 1,
887	@_	1016	@_
888	);	1017	);
889		1018
890	$self->{title} &&= new CFClient::UI::Label	1019	$self->{title} &&= new CFClient::UI::Label
891	align => 0,	1020	align => 0,
…		…
944	my ($ev, $x, $y) = @_;	1073	my ($ev, $x, $y) = @_;
945		1074
946	my $dx = $ev->{x} - $ox;	1075	my $dx = $ev->{x} - $ox;
947	my $dy = $ev->{y} - $oy;	1076	my $dy = $ev->{y} - $oy;
948		1077
		1078	$self->{user_x} = $wx + $dx * $mx;
		1079	$self->{user_y} = $wy + $dy * $my;
949	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
950	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
951	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1082	$self->move ($self->{user_x}, $self->{user_y});
952	$self->check_size;	1083	$self->check_size;
953	};	1084	};
954		1085
955	} elsif ($lr ^ $td) {	1086	} elsif ($lr ^ $td) {
956	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
959	$self->{motion} = sub {	1090	$self->{motion} = sub {
960	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
961		1092
962	($x, $y) = ($ev->{x}, $ev->{y});	1093	($x, $y) = ($ev->{x}, $ev->{y});
963		1094
964	$self->move ($bx + $x - $ox, $by + $y - $oy);	1095	$self->{user_x} = $bx + $x - $ox;
		1096	$self->{user_y} = $by + $y - $oy;
		1097
		1098	$self->move ($self->{user_x}, $self->{user_y});
965	$self->update;	1099	$self->update;
966	};	1100	};
967	}	1101	}
968	}	1102	}
969		1103
…		…
1031	sub new {	1165	sub new {
1032	my $class = shift;	1166	my $class = shift;
1033		1167
1034	$class->SUPER::new (	1168	$class->SUPER::new (
1035	col_expand => [],	1169	col_expand => [],
1036	@_	1170	@_,
1037	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038	}	1176	}
1039		1177
1040	sub add {	1178	sub add {
1041	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1042		1180
1043	$child->set_parent ($self);	1181	$child->set_parent ($self);
1044	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1045		1183
1046	$child->check_size;	1184	$self->check_size (1);
1047	}	1185	}
1048		1186
1049	sub children {
1050	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051	}
1052
1053	# 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?
1054	sub clear {	1188	sub clear {
1055	my ($self) = @_;	1189	my ($self) = @_;
1056		1190
1057	my @children = $self->children;	1191	my @children = $self->children;
1058	delete $self->{children};	1192	delete $self->{children};
…		…
1060	for (@children) {	1194	for (@children) {
1061	delete $_->{parent};	1195	delete $_->{parent};
1062	$_->hide;	1196	$_->hide;
1063	}	1197	}
1064		1198
		1199	$self->check_size (1);
1065	$self->update;	1200	$self->update;
1066	}	1201	}
1067		1202
1068	sub get_wh {	1203	sub get_wh {
1069	my ($self) = @_;	1204	my ($self) = @_;
…		…
1101	sub size_allocate {	1236	sub size_allocate {
1102	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1103		1238
1104	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1105		1240
1106	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1107	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1108		1243
1109	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1110	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1111	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1112	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1166	}	1301	}
1167	}	1302	}
1168		1303
1169	#############################################################################	1304	#############################################################################
1170		1305
1171	package CFClient::UI::HBox;	1306	package CFClient::UI::Box;
1172
1173	# TODO: wrap into common Box base class
1174		1307
1175	our @ISA = CFClient::UI::Container::;	1308	our @ISA = CFClient::UI::Container::;
1176		1309
1177	sub size_request {	1310	sub size_request {
1178	my ($self) = @_;	1311	my ($self) = @_;
1179		1312
1180	my @alloc = map [$_->size_request], @{$self->{children}};	1313	$self->{vertical}
1181		1314	? (
1182	(	1315	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1183	(List::Util::sum map $_->[0], @alloc),	1316	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184	(List::Util::max map $_->[1], @alloc),	1317	)
1185	)	1318	: (
		1319	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1320	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1321	)
1186	}	1322	}
1187		1323
1188	sub size_allocate {	1324	sub size_allocate {
1189	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1190		1326
1191	($h, $w) = ($w, $h);	1327	my $space = $self->{vertical} ? $h : $w;
1192
1193	my $children = $self->{children};	1328	my $children = $self->{children};
1194		1329
1195	my @h = map $_->{req_w}, @$children;	1330	my @req;
1196		1331
1197	my $req_h = List::Util::sum @h;	1332	if ($self->{homogeneous}) {
1198		1333	@req = ($space / (@$children || 1)) x @$children;
1199	if ($req_h > $h) {
1200	# ah well, not enough space
1201	$_ *= $h / $req_h for @h;
1202	} else {	1334	} else {
		1335	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1336	my $req = List::Util::sum @req;
		1337
		1338	if ($req > $space) {
		1339	# ah well, not enough space
		1340	$_ *= $space / $req for @req;
		1341	} else {
1203	my $exp = List::Util::sum map $_->{expand}, @$children;	1342	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204	$exp ||= 1;
1205		1343
		1344	$space = ($space - $req) / $expand; # remaining space to give away
		1345
		1346	$req[$_] += $space * $children->[$_]{expand}
1206	for (0 .. $#$children) {	1347	for 0 .. $#$children;
1207	my $child = $children->[$_];
1208
1209	my $alloc_h = $h[$_];
1210	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211	$h[$_] = $alloc_h;
1212	}	1348	}
1213	}	1349	}
1214		1350
1215	CFClient::UI::harmonize \@h;	1351	CFClient::UI::harmonize \@req;
1216		1352
1217	my $y = 0;	1353	my $pos = 0;
1218	for (0 .. $#$children) {	1354	for (0 .. $#$children) {
1219	my $child = $children->[$_];
1220	my $h = $h[$_];	1355	my $alloc = $req[$_];
1221	$child->configure ($y, 0, $h, $w);	1356	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222		1357
1223	$y += $h;	1358	$pos += $alloc;
1224	}	1359	}
1225		1360
1226	1	1361	1
1227	}	1362	}
1228		1363
1229	#############################################################################	1364	#############################################################################
1230		1365
		1366	package CFClient::UI::HBox;
		1367
		1368	our @ISA = CFClient::UI::Box::;
		1369
		1370	sub new {
		1371	my $class = shift;
		1372
		1373	$class->SUPER::new (
		1374	vertical => 0,
		1375	@_,
		1376	)
		1377	}
		1378
		1379	#############################################################################
		1380
1231	package CFClient::UI::VBox;	1381	package CFClient::UI::VBox;
1232		1382
1233	# TODO: wrap into common Box base class
1234
1235	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Box::;
1236		1384
1237	sub size_request {	1385	sub new {
1238	my ($self) = @_;	1386	my $class = shift;
1239		1387
1240	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$class->SUPER::new (
1241		1389	vertical => 1,
1242	(	1390	@_,
1243	(List::Util::max map $_->[0], @alloc),
1244	(List::Util::sum map $_->[1], @alloc),
1245	)	1391	)
1246	}
1247
1248	sub size_allocate {
1249	my ($self, $w, $h) = @_;
1250
1251	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253	my $children = $self->{children};
1254
1255	my @h = map $_->{req_h}, @$children;
1256
1257	my $req_h = List::Util::sum @h;
1258
1259	if ($req_h > $h) {
1260	# ah well, not enough space
1261	$_ *= $h / $req_h for @h;
1262	} else {
1263	my $exp = List::Util::sum map $_->{expand}, @$children;
1264	$exp ||= 1;
1265
1266	for (0 .. $#$children) {
1267	my $child = $children->[$_];
1268
1269	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270	}
1271	}
1272
1273	CFClient::UI::harmonize \@h;
1274
1275	my $y = 0;
1276	for (0 .. $#$children) {
1277	my $child = $children->[$_];
1278	my $h = $h[$_];
1279	$child->configure (0, $y, $w, $h);
1280
1281	$y += $h;
1282	}
1283
1284	1
1285	}	1392	}
1286		1393
1287	#############################################################################	1394	#############################################################################
1288		1395
1289	package CFClient::UI::Label;	1396	package CFClient::UI::Label;
…		…
1473	active_fg => [0, 0, 0],	1580	active_fg => [0, 0, 0],
1474	can_hover => 1,	1581	can_hover => 1,
1475	can_focus => 1,	1582	can_focus => 1,
1476	valign => 0,	1583	valign => 0,
1477	can_events => 1,	1584	can_events => 1,
		1585	#text => ...
1478	@_	1586	@_
1479	)	1587	)
1480	}	1588	}
1481		1589
1482	sub _set_text {	1590	sub _set_text {
…		…
1492	$self->{text} = $text;	1600	$self->{text} = $text;
1493		1601
1494	$text =~ s/./*/g if $self->{hidden};	1602	$text =~ s/./*/g if $self->{hidden};
1495	$self->{layout}->set_text ("$text ");	1603	$self->{layout}->set_text ("$text ");
1496		1604
1497	$self->emit (changed => $self->{text});	1605	$self->_emit (changed => $self->{text});
1498	}	1606	}
1499		1607
1500	sub set_text {	1608	sub set_text {
1501	my ($self, $text) = @_;	1609	my ($self, $text) = @_;
1502		1610
…		…
1514	my ($self) = @_;	1622	my ($self) = @_;
1515		1623
1516	my ($w, $h) = $self->SUPER::size_request;	1624	my ($w, $h) = $self->SUPER::size_request;
1517		1625
1518	($w + 1, $h) # add 1 for cursor	1626	($w + 1, $h) # add 1 for cursor
1519	}
1520
1521	sub size_allocate {
1522	my ($self, $w, $h) = @_;
1523
1524	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525	}	1627	}
1526		1628
1527	sub key_down {	1629	sub key_down {
1528	my ($self, $ev) = @_;	1630	my ($self, $ev) = @_;
1529		1631
…		…
1544	} elsif ($sym == CFClient::SDLK_HOME) {	1646	} elsif ($sym == CFClient::SDLK_HOME) {
1545	$self->{cursor} = 0;	1647	$self->{cursor} = 0;
1546	} elsif ($sym == CFClient::SDLK_END) {	1648	} elsif ($sym == CFClient::SDLK_END) {
1547	$self->{cursor} = length $text;	1649	$self->{cursor} = length $text;
1548	} elsif ($uni == 27) {	1650	} elsif ($uni == 27) {
1549	$self->emit ('escape');	1651	$self->_emit ('escape');
1550	} elsif ($uni) {	1652	} elsif ($uni) {
1551	substr $text, $self->{cursor}++, 0, chr $uni;	1653	substr $text, $self->{cursor}++, 0, chr $uni;
1552	}	1654	}
1553		1655
1554	$self->_set_text ($text);	1656	$self->_set_text ($text);
…		…
1641	if ($sym == 13) {	1743	if ($sym == 13) {
1642	unshift @{$self->{history}},	1744	unshift @{$self->{history}},
1643	my $txt = $self->get_text;	1745	my $txt = $self->get_text;
1644	$self->{history_pointer} = -1;	1746	$self->{history_pointer} = -1;
1645	$self->{history_saveback} = '';	1747	$self->{history_saveback} = '';
1646	$self->emit (activate => $txt);	1748	$self->_emit (activate => $txt);
1647	$self->update;	1749	$self->update;
1648		1750
1649	} elsif ($sym == CFClient::SDLK_UP) {	1751	} elsif ($sym == CFClient::SDLK_UP) {
1650	if ($self->{history_pointer} < 0) {	1752	if ($self->{history_pointer} < 0) {
1651	$self->{history_saveback} = $self->get_text;	1753	$self->{history_saveback} = $self->get_text;
…		…
1699	can_events => 1,	1801	can_events => 1,
1700	@_	1802	@_
1701	)	1803	)
1702	}	1804	}
1703		1805
		1806	sub activate { }
		1807
1704	sub button_up {	1808	sub button_up {
1705	my ($self, $ev, $x, $y) = @_;	1809	my ($self, $ev, $x, $y) = @_;
1706		1810
		1811	$self->emit ("activate")
1707	if ($x >= 0 && $x < $self->{w}	1812	if $x >= 0 && $x < $self->{w}
1708	&& $y >= 0 && $y < $self->{h}) {	1813	&& $y >= 0 && $y < $self->{h};
1709	$self->emit ("activate");
1710	}
1711	}	1814	}
1712		1815
1713	sub _draw {	1816	sub _draw {
1714	my ($self) = @_;	1817	my ($self) = @_;
1715		1818
…		…
1767	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1768		1871
1769	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771	$self->{state} = !$self->{state};	1874	$self->{state} = !$self->{state};
1772	$self->emit (changed => $self->{state});	1875	$self->_emit (changed => $self->{state});
1773	}	1876	}
1774	}	1877	}
1775		1878
1776	sub _draw {	1879	sub _draw {
1777	my ($self) = @_;	1880	my ($self) = @_;
…		…
2052	my $self = $class->SUPER::new (	2155	my $self = $class->SUPER::new (
2053	fg => [1, 1, 1],	2156	fg => [1, 1, 1],
2054	active_fg => [0, 0, 0],	2157	active_fg => [0, 0, 0],
2055	bg => [0, 0, 0, 0.2],	2158	bg => [0, 0, 0, 0.2],
2056	active_bg => [1, 1, 1, 0.5],	2159	active_bg => [1, 1, 1, 0.5],
2057	range => [0, 0, 100, 10],	2160	range => [0, 0, 100, 10, 0],
2058	req_w => $::WIDTH / 80,	2161	req_w => $::WIDTH / 80,
2059	req_h => $::WIDTH / 80,	2162	req_h => $::WIDTH / 80,
2060	vertical => 0,	2163	vertical => 0,
2061	can_hover => 1,	2164	can_hover => 1,
2062	inner_pad => .05,	2165	inner_pad => 0.02,
2063	@_	2166	@_
2064	);	2167	);
2065		2168
2066	$self->set_value ($self->{range}[0]);	2169	$self->set_value ($self->{range}[0]);
2067	$self->update;	2170	$self->update;
2068		2171
2069	$self	2172	$self
2070	}	2173	}
2071		2174
		2175	sub set_range {
		2176	my ($self, $range) = @_;
		2177
		2178	($range, $self->{range}) = ($self->{range}, $range);
		2179
		2180	$self->update
		2181	if "@$range" ne "@{$self->{range}}";
		2182	}
		2183
2072	sub set_value {	2184	sub set_value {
2073	my ($self, $value) = @_;	2185	my ($self, $value) = @_;
2074		2186
2075	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2187	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076		2188
2077	$hi = $lo + 1 if $hi <= $lo;	2189	$hi = $lo + 1 if $hi <= $lo;
2078		2190
		2191	$page = $hi - $lo if $page > $hi - $lo;
		2192
2079	$value = $lo if $value < $lo;	2193	$value = $lo if $value < $lo;
2080	$value = $hi if $value > $hi;	2194	$value = $hi - $page if $value > $hi - $page;
2081		2195
2082	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2196	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083	if $unit;	2197	if $unit;
2084		2198
2085	$page = $hi - $lo if $page > $hi - $lo;
2086
2087	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2199	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088		2200
2089	if ($value != $old_value) {	2201	if ($value != $old_value) {
2090	$self->emit (changed => $value);	2202	$self->_emit (changed => $value);
2091	$self->update;	2203	$self->update;
2092	}	2204	}
2093	}	2205	}
2094		2206
2095	sub size_request {	2207	sub size_request {
…		…
2103		2215
2104	sub button_down {	2216	sub button_down {
2105	my ($self, $ev, $x, $y) = @_;	2217	my ($self, $ev, $x, $y) = @_;
2106		2218
2107	$self->SUPER::button_down ($ev, $x, $y);	2219	$self->SUPER::button_down ($ev, $x, $y);
		2220
		2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2222
2108	$self->mouse_motion ($ev, $x, $y);	2223	$self->mouse_motion ($ev, $x, $y);
2109	}	2224	}
2110		2225
2111	sub mouse_motion {	2226	sub mouse_motion {
2112	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
…		…
2114	if ($GRAB == $self) {	2229	if ($GRAB == $self) {
2115	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2230	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116		2231
2117	my (undef, $lo, $hi, $page) = @{$self->{range}};	2232	my (undef, $lo, $hi, $page) = @{$self->{range}};
2118		2233
2119	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120		2235
2121	$self->set_value ($x * ($hi - $lo) + $lo);	2236	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122	}	2237	}
2123	}	2238	}
2124		2239
2125	sub update {	2240	sub update {
2126	my ($self) = @_;	2241	my ($self) = @_;
2127		2242
2128	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2243	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129	$self->set_value ($self->{range}[0]);	2244	$self->set_value ($self->{range}[0]);
2130		2245
2131	my ($value, $lo, $hi, $page) = @{$self->{range}};	2246	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2247	my $range = ($hi - $page - $lo) || 1e-100;
2132		2248
2133	my $inner_w = 1 - 2 * $self->{inner_pad};	2249	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134		2250
2135	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2251	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2252	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136		2253
2137	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2254	$value = ($value - $lo) / $range;
2138	$value = $self->{scale} * ($value - $lo);	2255	$value = $value * $self->{scale} + $self->{offset};
2139		2256
2140	$value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142	$value = 0 if $value < 0;
2143	$page = 1 - $value if $value + $page > 1;
2144
2145	$self->{knob_x} = $value;	2257	$self->{knob_x} = $value - $knob_w * 0.5;
2146	$self->{knob_w} = $page;	2258	$self->{knob_w} = $knob_w;
2147	});	2259	});
2148		2260
2149	$self->SUPER::update;	2261	$self->SUPER::update;
2150	}	2262	}
2151		2263
…		…
2157	glScale $self->{w}, $self->{h};	2269	glScale $self->{w}, $self->{h};
2158		2270
2159	if ($self->{vertical}) {	2271	if ($self->{vertical}) {
2160	# draw a vertical slider like a rotated horizontal slider	2272	# draw a vertical slider like a rotated horizontal slider
2161		2273
		2274	glTranslate 1, 0, 0;
2162	glRotate 90, 0, 0, 1;	2275	glRotate 90, 0, 0, 1;
2163	glTranslate 0, 1, 0;
2164	}	2276	}
2165		2277
2166	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2278	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2279	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168		2280
…		…
2175	# draw handle	2287	# draw handle
2176	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2288	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177		2289
2178	glDisable GL_TEXTURE_2D;	2290	glDisable GL_TEXTURE_2D;
2179	}	2291	}
		2292
		2293	#############################################################################
		2294
		2295	package CFClient::UI::ValSlider;
		2296
		2297	our @ISA = CFClient::UI::HBox::;
		2298
		2299	sub new {
		2300	my ($class, %arg) = @_;
		2301
		2302	my $range = delete $arg{range};
		2303
		2304	my $self = $class->SUPER::new (
		2305	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2306	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2307	to_value => sub { shift },
		2308	from_value => sub { shift },
		2309	%arg,
		2310	);
		2311
		2312	$self->{slider}->connect (changed => sub {
		2313	my ($self, $value) = @_;
		2314	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2315	$self->{parent}->emit (changed => $value);
		2316	});
		2317
		2318	# $self->{entry}->connect (changed => sub {
		2319	# my ($self, $value) = @_;
		2320	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2321	# $self->{parent}->emit (changed => $value);
		2322	# });
		2323
		2324	$self->add ($self->{slider}, $self->{entry});
		2325
		2326	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2327
		2328	$self
		2329	}
		2330
		2331	sub set_range { shift->{slider}->set_range (@_) }
		2332	sub set_value { shift->{slider}->set_value (@_) }
2180		2333
2181	#############################################################################	2334	#############################################################################
2182		2335
2183	package CFClient::UI::TextView;	2336	package CFClient::UI::TextView;
2184		2337
…		…
2214		2367
2215	$self->{fontsize} = $fontsize;	2368	$self->{fontsize} = $fontsize;
2216	$self->reflow;	2369	$self->reflow;
2217	}	2370	}
2218		2371
2219	sub text_height {
2220	my ($self, $text) = @_;
2221
2222	my $layout = $self->{layout};
2223
2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225	$layout->set_width ($self->{children}[0]{w});
2226	$layout->set_markup ($text);
2227
2228	($layout->size)[1]
2229	}
2230
2231	sub reflow {
2232	my ($self) = @_;
2233
2234	$self->{need_reflow}++;
2235	$self->update;
2236	}
2237
2238	sub size_allocate {	2372	sub size_allocate {
2239	my ($self, $w, $h) = @_;	2373	my ($self, $w, $h) = @_;
2240		2374
2241	$self->SUPER::size_allocate ($w, $h);	2375	$self->SUPER::size_allocate ($w, $h);
2242		2376
…		…
2245	$self->{layout}->set_width ($self->{children}[0]{w});	2379	$self->{layout}->set_width ($self->{children}[0]{w});
2246		2380
2247	$self->reflow;	2381	$self->reflow;
2248	}	2382	}
2249		2383
		2384	sub text_size {
		2385	my ($self, $text, $indent) = @_;
		2386
		2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390	$layout->set_width ($self->{children}[0]{w} - $indent);
		2391	$layout->set_markup ($text);
		2392
		2393	$layout->size
		2394	}
		2395
		2396	sub reflow {
		2397	my ($self) = @_;
		2398
		2399	$self->{need_reflow}++;
		2400	$self->update;
		2401	}
		2402
		2403	sub set_offset {
		2404	my ($self, $offset) = @_;
		2405
		2406	# todo: base offset on lines or so, not on pixels
		2407	$self->{children}[1]->set_value ($offset);
		2408	}
		2409
		2410	sub clear {
		2411	my ($self) = @_;
		2412
		2413	$self->{par} = [];
		2414	$self->{height} = 0;
		2415	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2416	}
		2417
2250	sub add_paragraph {	2418	sub add_paragraph {
2251	my ($self, $color, $text) = @_;	2419	my ($self, $color, $text, $indent) = @_;
2252		2420
2253	#TODO: intelligently "reformat" paragraph	2421	for my $line (split /\n/, $text) {
2254		2422	my ($w, $h) = $self->text_size ($line);
2255	my $height = $self->text_height ($text);
2256
2257	$self->{height} += $height;	2423	$self->{height} += $h;
		2424	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2425	}
2258		2426
2259	push @{$self->{par}}, [$height, $color, $text];
2260
2261	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2427	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262	$self->{children}[1]->update;
2263	}	2428	}
2264		2429
2265	sub update {	2430	sub update {
2266	my ($self) = @_;	2431	my ($self) = @_;
2267		2432
…		…
2270	return unless $self->{h} > 0;	2435	return unless $self->{h} > 0;
2271		2436
2272	delete $self->{texture};	2437	delete $self->{texture};
2273		2438
2274	$ROOT->on_post_alloc ($self, sub {	2439	$ROOT->on_post_alloc ($self, sub {
		2440	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2441
2275	if (delete $self->{need_reflow}) {	2442	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2443	my $height = 0;
2277		2444
2278	$height += $_->[0] = $self->text_height ($_->[2])	2445	my $layout = $self->{layout};
		2446
		2447	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2448
2279	for @{$self->{par}};	2449	for (@{$self->{par}}) {
		2450	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2451	$layout->set_width ($W - $_->[3]);
		2452	$layout->set_markup ($_->[4]);
		2453	my ($w, $h) = $layout->size;
		2454	$_->[0] = $w + $_->[3];
		2455	$_->[1] = $h;
		2456	}
		2457
		2458	$height += $_->[1];
		2459	}
2280		2460
2281	$self->{height} = $height;	2461	$self->{height} = $height;
2282		2462
2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2463	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284		2464
2285	delete $self->{texture};	2465	delete $self->{texture};
2286	}	2466	}
2287		2467
2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2468	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289	glClearColor 0, 0, 0, 0;	2469	glClearColor 0.5, 0.5, 0.5, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2470	glClear GL_COLOR_BUFFER_BIT;
2291		2471
2292	glEnable GL_TEXTURE_2D;
2293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295	my $top = int $self->{children}[1]{range}[0];	2472	my $top = int $self->{children}[1]{range}[0];
2296		2473
2297	my $y0 = $top;	2474	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2475	my $y1 = $top + $H;
2299		2476
2300	my $y = 0;	2477	my $y = 0;
2301		2478
2302	my $layout = $self->{layout};	2479	my $layout = $self->{layout};
2303		2480
2304	$layout->set_font ($self->{font}) if $self->{font};	2481	$layout->set_font ($self->{font}) if $self->{font};
2305		2482
		2483	glEnable GL_BLEND;
		2484	#TODO# not correct in windows where rgba is forced off
		2485	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2486
2306	for my $par (@{$self->{par}}) {	2487	for my $par (@{$self->{par}}) {
2307	my $h = $par->[0];	2488	my $h = $par->[1];
2308		2489
2309	if ($y0 < $y + $h && $y < $y1) {	2490	if ($y0 < $y + $h && $y < $y1) {
2310	$layout->set_foreground (@{ $par->[1] });	2491	$layout->set_foreground (@{ $par->[2] });
		2492	$layout->set_width ($W - $par->[3]);
2311	$layout->set_markup ($par->[2]);	2493	$layout->set_markup ($par->[4]);
2312		2494
2313	my ($W, $H) = $layout->size;	2495	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2496
		2497	glRasterPos $par->[3], $y - $y0;
		2498	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315	}	2499	}
2316		2500
2317	$y += $h;	2501	$y += $h;
2318	}	2502	}
2319		2503
2320	glDisable GL_TEXTURE_2D;	2504	glDisable GL_BLEND;
2321	};	2505	};
2322	});	2506	});
2323	}	2507	}
2324		2508
2325	sub _draw {	2509	sub _draw {
2326	my ($self) = @_;	2510	my ($self) = @_;
2327		2511
2328	glEnable GL_TEXTURE_2D;	2512	glEnable GL_TEXTURE_2D;
2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330	glColor 1, 1, 1, 1;	2514	glColor 1, 1, 1, 1;
2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2515	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332	glDisable GL_TEXTURE_2D;	2516	glDisable GL_TEXTURE_2D;
2333		2517
2334	$self->{children}[1]->draw;	2518	$self->{children}[1]->draw;
2335		2519
2336	}	2520	}
…		…
2385		2569
2386	sub new {	2570	sub new {
2387	my $class = shift;	2571	my $class = shift;
2388		2572
2389	my $self = $class->SUPER::new (	2573	my $self = $class->SUPER::new (
2390	state => 0,	2574	state => 0,
2391	connect_activate => \&toggle_flopper,	2575	on_activate => \&toggle_flopper,
2392	@_	2576	@_
2393	);	2577	);
2394		2578
2395	if ($self->{state}) {
2396	$self->{state} = 0;
2397	$self->toggle_flopper;
2398	}
2399
2400	$self	2579	$self
2401	}	2580	}
2402		2581
2403	sub toggle_flopper {	2582	sub toggle_flopper {
2404	my ($self) = @_;	2583	my ($self) = @_;
2405		2584
2406	# TODO: use animation	2585	$self->{other}->toggle_visibility;
2407	if ($self->{state} = !$self->{state}) {
2408	$CFClient::UI::ROOT->add ($self->{other});
2409	$self->{other}->move ($self->coord2global (0, $self->{h}));
2410	$self->emit ("open");
2411	} else {
2412	$CFClient::UI::ROOT->remove ($self->{other});
2413	$self->emit ("close");
2414	}
2415
2416	$self->emit (changed => $self->{state});
2417	}	2586	}
2418		2587
2419	#############################################################################	2588	#############################################################################
2420		2589
2421	package CFClient::UI::Tooltip;	2590	package CFClient::UI::Tooltip;
…		…
2496	use CFClient::OpenGL;	2665	use CFClient::OpenGL;
2497		2666
2498	sub new {	2667	sub new {
2499	my $class = shift;	2668	my $class = shift;
2500		2669
2501	$class->SUPER::new (	2670	my $self = $class->SUPER::new (
2502	aspect => 1,	2671	aspect => 1,
		2672	can_events => 0,
2503	@_,	2673	@_,
2504	)	2674	);
		2675
		2676	if ($self->{anim} && $self->{animspeed}) {
		2677	Scalar::Util::weaken (my $widget = $self);
		2678
		2679	$self->{timer} = Event->timer (
		2680	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2681	hard => 1,
		2682	interval => $self->{animspeed},
		2683	cb => sub {
		2684	++$widget->{frame};
		2685	$widget->update;
		2686	},
		2687	);
		2688	}
		2689
		2690	$self
2505	}	2691	}
2506		2692
2507	sub size_request {	2693	sub size_request {
2508	(32, 8)	2694	(32, 8)
2509	}	2695	}
2510		2696
		2697	sub update {
		2698	my ($self) = @_;
		2699
		2700	return unless $self->{visible};
		2701
		2702	$self->SUPER::update;
		2703	}
		2704
2511	sub _draw {	2705	sub _draw {
2512	my ($self) = @_;	2706	my ($self) = @_;
2513		2707
2514	return unless $::CONN;#d# manage and cache textures differently	2708	return unless $::CONN;
		2709
		2710	my $face;
		2711
		2712	if ($self->{frame}) {
		2713	my $anim = $::CONN->{anim}[$self->{anim}];
		2714
		2715	$face = $anim->[ $self->{frame} % @$anim ]
		2716	if $anim && @$anim;
		2717	}
		2718
2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2719	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516		2720
2517	# TODO animation
2518	if ($tex) {	2721	if ($tex) {
2519	glEnable GL_TEXTURE_2D;	2722	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2724	glColor 1, 1, 1, 1;
2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2725	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2524	}	2727	}
2525	}	2728	}
2526		2729
2527	#############################################################################	2730	sub DESTROY {
		2731	my ($self) = @_;
2528		2732
		2733	$self->{timer}->cancel
		2734	if $self->{timer};
		2735
		2736	$self->SUPER::DESTROY;
		2737	}
		2738
		2739	#############################################################################
		2740
2529	package CFClient::UI::InventoryItem;	2741	package CFClient::UI::Inventory;
2530		2742
2531	our @ISA = CFClient::UI::HBox::;	2743	our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533	sub _item_to_desc {
2534	my ($item) = @_;
2535
2536	my $desc =
2537	$item->{nrof} < 2
2538	? $item->{name}
2539	: "$item->{nrof} $item->{name_pl}";
2540
2541	$item->{flags} & Crossfire::Protocol::F_OPEN
2542	and $desc .= " (open)";
2543	$item->{flags} & Crossfire::Protocol::F_APPLIED
2544	and $desc .= " (applied)";
2545	$item->{flags} & Crossfire::Protocol::F_UNPAID
2546	and $desc .= " (unpaid)";
2547	$item->{flags} & Crossfire::Protocol::F_MAGIC
2548	and $desc .= " (magic)";
2549	$item->{flags} & Crossfire::Protocol::F_CURSED
2550	and $desc .= " (cursed)";
2551	$item->{flags} & Crossfire::Protocol::F_DAMNED
2552	and $desc .= " (damned)";
2553	$item->{flags} & Crossfire::Protocol::F_LOCKED
2554	and $desc .= " *";
2555
2556	$desc
2557	}
2558		2744
2559	sub new {	2745	sub new {
2560	my $class = shift;	2746	my $class = shift;
2561		2747
2562	my %args = @_;
2563
2564	my $item = delete $args{item};
2565
2566	my $desc = _item_to_desc ($item);
2567
2568	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
2569	can_hover => 1,	2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2570	can_events => 1,
2571	tooltip => ((CFClient::UI::Label::escape $desc)
2572	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573	connect_button_down => sub {
2574	my ($self, $ev, $x, $y) = @_;
2575
2576	# todo: maybe put examine on 1? but should just be a tooltip :(
2577	if ($ev->{button} == 1) {
2578	my $targ = $::CONN->{player}{tag};
2579
2580	if ($item->{container} == $::CONN->{player}{tag}) {
2581	$targ = $main::OPENCONT;
2582	}
2583
2584	$::CONN->send ("move $targ $item->{tag} 0");
2585	} elsif ($ev->{button} == 2) {
2586	$::CONN->send ("apply $item->{tag}");
2587	} elsif ($ev->{button} == 3) {
2588	my @menu_items = (
2589	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593	[
2594	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595	sub { $::CONN->send ("lock $item->{tag}") },
2596	],
2597	);
2598
2599	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600	}
2601
2602	1
2603	},
2604	%args
2605	);
2606
2607
2608	$self->add (new CFClient::UI::Face
2609	can_events => 0,
2610	face => $item->{face},
2611	anim => $item->{anim},
2612	animspeed => $item->{animspeed},
2613	);
2614
2615	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617	$self->{item} = $item;
2618
2619	$self->update_item;
2620
2621	$self
2622	}
2623
2624	sub update_item {
2625	my ($self) = @_;
2626
2627	my $desc = _item_to_desc ($self->{item});
2628
2629	$self->{name_lbl}->set_text ($desc);
2630	}
2631
2632	#############################################################################
2633
2634	package CFClient::UI::Inventory;
2635
2636	our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638	sub new {
2639	my $class = shift;
2640
2641	my $self = $class->SUPER::new (
2642	scrolled => (new CFClient::UI::VBox),
2643	@_,	2750	@_,
2644	);	2751	);
2645		2752
2646	$self	2753	$self
2647	}	2754	}
…		…
2657	or ($a->{name} cmp $b->{name})	2764	or ($a->{name} cmp $b->{name})
2658	} @$items;	2765	} @$items;
2659		2766
2660	$self->{real_items} = \@items;	2767	$self->{real_items} = \@items;
2661		2768
		2769	my $row = 0;
2662	for my $item (@items) {	2770	for my $item (@items) {
2663	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2771	CFClient::Item::update_widgets $item;
2664	$item->update_item ();
2665	}
2666		2772
2667	$self->{scrolled}->add (@items);	2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2668		2776
2669	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2777	$row++;
2670	}	2778	}
2671
2672	sub size_request {
2673	my ($self) = @_;
2674	($self->{req_w}, $self->{req_h});
2675	}	2779	}
2676		2780
2677	#############################################################################	2781	#############################################################################
2678		2782
2679	package CFClient::UI::Menu;	2783	package CFClient::UI::Menu;
…		…
2714		2818
2715	# popup given the event (must be a mouse button down event currently)	2819	# popup given the event (must be a mouse button down event currently)
2716	sub popup {	2820	sub popup {
2717	my ($self, $ev) = @_;	2821	my ($self, $ev) = @_;
2718		2822
2719	$self->emit ("popdown");	2823	$self->_emit ("popdown");
2720		2824
2721	# maybe save $GRAB? must be careful about events...	2825	# maybe save $GRAB? must be careful about events...
2722	$GRAB = $self;	2826	$GRAB = $self;
2723	$self->{button} = $ev->{button};	2827	$self->{button} = $ev->{button};
2724		2828
…		…
2739		2843
2740	if ($ev->{button} == $self->{button}) {	2844	if ($ev->{button} == $self->{button}) {
2741	undef $GRAB;	2845	undef $GRAB;
2742	$self->hide;	2846	$self->hide;
2743		2847
2744	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2745	$self->{hover}[1]->() if $self->{hover};	2849	$self->{hover}[1]->() if $self->{hover};
2746	}	2850	}
2747	}	2851	}
2748		2852
2749	#############################################################################	2853	#############################################################################
…		…
2811	sub add {	2915	sub add {
2812	my ($self, $text, %arg) = @_;	2916	my ($self, $text, %arg) = @_;
2813		2917
2814	$text =~ s/^\s+//;	2918	$text =~ s/^\s+//;
2815	$text =~ s/\s+$//;	2919	$text =~ s/\s+$//;
		2920
		2921	return unless $text;
2816		2922
2817	my $timeout = time + ((delete $arg{timeout}) || 60);	2923	my $timeout = time + ((delete $arg{timeout}) || 60);
2818		2924
2819	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2925	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820		2926
…		…
2864		2970
2865	sub new {	2971	sub new {
2866	my $class = shift;	2972	my $class = shift;
2867		2973
2868	$class->SUPER::new (	2974	$class->SUPER::new (
		2975	visible => 1,
2869	@_,	2976	@_,
2870	)	2977	)
2871	}	2978	}
2872		2979
2873	sub configure {	2980	sub configure {
…		…
2891	}	2998	}
2892		2999
2893	sub size_allocate {	3000	sub size_allocate {
2894	my ($self, $w, $h) = @_;	3001	my ($self, $w, $h) = @_;
2895		3002
2896	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902	for my $child ($self->children) {	3003	for my $child ($self->children) {
2903	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904		3005
2905	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906	if exists $child->{req_x};	3007	if exists $child->{req_x};
2907		3008
2908	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909	if exists $child->{req_y};	3010	if exists $child->{req_y};
2910		3011
		3012	delete @$child{qw(req_x req_y)};
		3013
2911	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913		3016
2914	$child->configure ($X, $Y, $W, $H);	3017	$child->configure ($X, $Y, $W, $H);
2915	}	3018	}
…		…
2936		3039
2937	sub add {	3040	sub add {
2938	my ($self, @children) = @_;	3041	my ($self, @children) = @_;
2939		3042
2940	for my $child (@children) {	3043	for my $child (@children) {
2941	$child->{toplevel} = 1;	3044	$child->{is_toplevel} = 1;
2942		3045
2943	# integerise window positions	3046	# integerise window positions
2944	$child->{x} = int $child->{x};	3047	$child->{x} = int $child->{x};
2945	$child->{y} = int $child->{y};	3048	$child->{y} = int $child->{y};
2946	}	3049	}
2947		3050
2948	$self->SUPER::add (@children);	3051	$self->SUPER::add (@children);
		3052
		3053	for (my @widgets = @children; my $w = pop @widgets; ) {
		3054	push @widgets, $w->children;
		3055	$w->set_visible;
		3056	}
		3057
		3058	}
		3059
		3060	sub remove {
		3061	my ($self, @children) = @_;
		3062
		3063	$self->SUPER::remove (@children);
		3064
		3065	while (@children) {
		3066	my $w = pop @children;
		3067	push @children, $w->children;
		3068	$w->set_invisible;
		3069	}
2949	}	3070	}
2950		3071
2951	sub on_refresh {	3072	sub on_refresh {
2952	my ($self, $id, $cb) = @_;	3073	my ($self, $id, $cb) = @_;
2953		3074
…		…
2967	$_->()	3088	$_->()
2968	for values %{delete $self->{refresh_hook}};	3089	for values %{delete $self->{refresh_hook}};
2969	}	3090	}
2970		3091
2971	if ($self->{check_size}) {	3092	if ($self->{check_size}) {
2972	my @queue = ([], []);	3093	my @queue;
2973		3094
2974	for (;;) {	3095	for (;;) {
2975	if ($self->{check_size}) {	3096	if ($self->{check_size}) {
2976	# heuristic: check containers last	3097	#TODO use array-of-depth approach
2977	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3098
		3099	@queue = sort { $a->{visible} <=> $b->{visible} }
2978	for values %{delete $self->{check_size}}	3100	@queue, values %{delete $self->{check_size}};
2979	}	3101	}
2980		3102
2981	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3103	my $widget = pop @queue || last;
2982		3104
		3105	defined $widget->{visible} or last; # do not resize invisible widgets
		3106
2983	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2984	? @$widget{qw(user_w user_h)}	3108	? @$widget{qw(def_w def_h)}
2985	: $widget->size_request;	3109	: $widget->size_request;
2986		3110
2987	if (delete $widget->{force_alloc}	3111	if (delete $widget->{force_alloc}
2988	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3006	$w = 0 if $w < 0;	3130	$w = 0 if $w < 0;
3007	$h = 0 if $h < 0;	3131	$h = 0 if $h < 0;
3008		3132
3009	$widget->{w} = $w;	3133	$widget->{w} = $w;
3010	$widget->{h} = $h;	3134	$widget->{h} = $h;
3011	$widget->size_allocate ($w, $h);
3012	$widget->emit (size_allocate => $w, $h);	3135	$widget->emit (size_allocate => $w, $h);
3013	}	3136	}
3014	}	3137	}
3015		3138
3016	while ($self->{post_alloc_hook}) {	3139	while ($self->{post_alloc_hook}) {
…		…
3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023	glClear GL_COLOR_BUFFER_BIT;	3146	glClear GL_COLOR_BUFFER_BIT;
3024		3147
3025	glMatrixMode GL_PROJECTION;	3148	glMatrixMode GL_PROJECTION;
3026	glLoadIdentity;	3149	glLoadIdentity;
3027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028	glMatrixMode GL_MODELVIEW;	3151	glMatrixMode GL_MODELVIEW;
3029	glLoadIdentity;	3152	glLoadIdentity;
3030		3153
3031	$self->_draw;	3154	$self->_draw;
3032	}	3155	}

Diff Legend

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