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.246 by root, Sun May 28 00:40:51 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 show_centered {
210	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
211		283
212	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
214		299
215	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
216	if $self->{parent};	301	if $self->{parent};
217	}	302	}
218		303
…		…
227	}	312	}
228		313
229	sub set_size {	314	sub set_size {
230	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
231		316
232	$self->{user_w} = $w;	317	$self->{def_w} = $w;
233	$self->{user_h} = $h;	318	$self->{def_h} = $h;
234		319
235	$self->check_size;	320	$self->check_size;
236	}	321	}
237		322
238	sub size_request {	323	sub size_request {
…		…
288	}	373	}
289		374
290	sub set_tooltip {	375	sub set_tooltip {
291	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
292		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
293	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
294		384
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
297	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
318	return if $FOCUS == $self;	408	return if $FOCUS == $self;
319	return unless $self->{can_focus};	409	return unless $self->{can_focus};
320		410
321	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
322		412
323	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
324		414
325	$focus->update if $focus;	415	$focus->update if $focus;
326	$FOCUS->update;	416	$FOCUS->update;
327	}	417	}
328		418
…		…
331		421
332	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
333		423
334	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
335		425
336	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
337		427
338	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
339	}	432	}
340		433
341	sub mouse_motion { }	434	sub mouse_motion { }
342	sub button_up { }	435	sub button_up { }
343	sub key_down { }	436	sub key_down { }
344	sub key_up { }	437	sub key_up { }
345		438
346	sub button_down {	439	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
348		441
349	$self->focus_in;	442	$self->focus_in;
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	477	glPushMatrix;
385	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	481	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
392	glEnd;	485	glEnd;
393	glPopMatrix;	486	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	488	}
396	}	489	}
…		…
416	sub set_parent {	509	sub set_parent {
417	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
418		511
419	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
420		513
421	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
422	$self->check_size	516	$self->check_size;
423	unless exists $self->{req_w};	517	$self->show;
424	}	518	}
425		519
426	sub check_size {	520	sub check_size {
427	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
428		522
…		…
441	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
442		536
443	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}	538	}
445		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
446	sub emit {	546	sub emit {
447	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
448		548
449	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) = @_;
450	}	555	}
451		556
452	sub DESTROY {	557	sub DESTROY {
453	my ($self) = @_;	558	my ($self) = @_;
454		559
…		…
567	delete $child->{parent};	672	delete $child->{parent};
568	$child->hide;	673	$child->hide;
569		674
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		676
572	$self->check_size;	677	$self->check_size (1);
573	$self->update;	678	$self->update;
574	}	679	}
575		680
576	sub clear {	681	sub clear {
577	my ($self) = @_;	682	my ($self) = @_;
…		…
691	$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 {
692	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
694		799
695	$self->_render;	800	$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	};	801	};
704	}	802	}
705		803
706	sub _draw {	804	sub _draw {
707	my ($self) = @_;	805	my ($self) = @_;
…		…
711	my $tex = $self->{texture}	809	my $tex = $self->{texture}
712	or return;	810	or return;
713		811
714	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
717		815
718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719		817
720	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
721	}	819	}
…		…
724		822
725	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
726		824
727	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
728		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
729	sub size_request {	837	sub size_request {
730	my ($self) = @_;	838	my ($self) = @_;
731		839
732	@$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)};
733	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
734		841
735	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
736	}	843	}
737		844
738	sub size_allocate {	845	sub size_allocate {
739	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
740		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);
741	$self->update;	852	$self->update;
742	}	853	}
743		854
744	sub set_offset {	855	sub set_offset {
745	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
796	my $class = shift;	907	my $class = shift;
797		908
798	my $self;	909	my $self;
799		910
800	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
801	vertical => 1,	912	vertical => 1,
802	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
803	connect_changed => sub {	914	on_changed => sub {
804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
805	},	916	},
806	;	917	;
807		918
808	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
809	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
810	slider => $slider,	921	slider => $slider,
811	@_,	922	@_,
812	);	923	);
813		924
814	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
815	$self->add ($self->{vp});	926	$self->add ($self->{vp});
816	$self->add ($self->{slider});	927	$self->add ($self->{slider});
817		928
818	$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]);
819	}	949	}
820		950
821	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
822	# update viewport offset on scroll	952	# update viewport offset on scroll
823		953
…		…
874	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875		1005
876	sub new {	1006	sub new {
877	my $class = shift;	1007	my $class = shift;
878		1008
879	# TODO: user_x, user_y, overwrite moveto?
880
881	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
882	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
883	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
884	border => 0.6,	1012	border => 0.6,
885	toplevel => 1,	1013	is_toplevel => 1,
886	can_events => 1,	1014	can_events => 1,
887	@_	1015	@_
888	);	1016	);
889		1017
890	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
891	align => 0,	1019	align => 0,
…		…
944	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
945		1073
946	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
947	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
948		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
949	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
950	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
951	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
952	$self->check_size;	1082	$self->check_size;
953	};	1083	};
954		1084
955	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
956	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
959	$self->{motion} = sub {	1089	$self->{motion} = sub {
960	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
961		1091
962	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
963		1093
964	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
965	$self->update;	1098	$self->update;
966	};	1099	};
967	}	1100	}
968	}	1101	}
969		1102
…		…
1031	sub new {	1164	sub new {
1032	my $class = shift;	1165	my $class = shift;
1033		1166
1034	$class->SUPER::new (	1167	$class->SUPER::new (
1035	col_expand => [],	1168	col_expand => [],
1036	@_	1169	@_,
1037	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038	}	1175	}
1039		1176
1040	sub add {	1177	sub add {
1041	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1042		1179
1043	$child->set_parent ($self);	1180	$child->set_parent ($self);
1044	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1045		1182
1046	$child->check_size;	1183	$self->check_size (1);
1047	}	1184	}
1048		1185
1049	sub children {
1050	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051	}
1052
1053	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
1054	sub clear {	1187	sub clear {
1055	my ($self) = @_;	1188	my ($self) = @_;
1056		1189
1057	my @children = $self->children;	1190	my @children = $self->children;
1058	delete $self->{children};	1191	delete $self->{children};
…		…
1060	for (@children) {	1193	for (@children) {
1061	delete $_->{parent};	1194	delete $_->{parent};
1062	$_->hide;	1195	$_->hide;
1063	}	1196	}
1064		1197
		1198	$self->check_size (1);
1065	$self->update;	1199	$self->update;
1066	}	1200	}
1067		1201
1068	sub get_wh {	1202	sub get_wh {
1069	my ($self) = @_;	1203	my ($self) = @_;
…		…
1101	sub size_allocate {	1235	sub size_allocate {
1102	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1103		1237
1104	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1105		1239
1106	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1107	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1108		1242
1109	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1110	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1111	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1112	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1166	}	1300	}
1167	}	1301	}
1168		1302
1169	#############################################################################	1303	#############################################################################
1170		1304
1171	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1172
1173	# TODO: wrap into common Box base class
1174		1306
1175	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1176		1308
1177	sub size_request {	1309	sub size_request {
1178	my ($self) = @_;	1310	my ($self) = @_;
1179		1311
1180	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1181		1313	? (
1182	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1183	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184	(List::Util::max map $_->[1], @alloc),	1316	)
1185	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1186	}	1321	}
1187		1322
1188	sub size_allocate {	1323	sub size_allocate {
1189	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1190		1325
1191	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1192
1193	my $children = $self->{children};	1327	my $children = $self->{children};
1194		1328
1195	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1196
1197	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1198		1331
1199	if ($req_h > $h) {	1332	if ($req > $space) {
1200	# ah well, not enough space	1333	# ah well, not enough space
1201	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1202	} else {	1335	} else {
1203	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204	$exp ||= 1;
1205		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1206	for (0 .. $#$children) {	1339	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	}
1213	}	1340	}
1214		1341
1215	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1216		1343
1217	my $y = 0;	1344	my $pos = 0;
1218	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1219	my $child = $children->[$_];
1220	my $h = $h[$_];	1346	my $alloc = $req[$_];
1221	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222		1348
1223	$y += $h;	1349	$pos += $alloc;
1224	}	1350	}
1225		1351
1226	1	1352	1
1227	}	1353	}
1228		1354
1229	#############################################################################	1355	#############################################################################
1230		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1231	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1232		1373
1233	# TODO: wrap into common Box base class
1234
1235	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1236		1375
1237	sub size_request {	1376	sub new {
1238	my ($self) = @_;	1377	my $class = shift;
1239		1378
1240	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1241		1380	vertical => 1,
1242	(	1381	@_,
1243	(List::Util::max map $_->[0], @alloc),
1244	(List::Util::sum map $_->[1], @alloc),
1245	)	1382	)
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	}	1383	}
1286		1384
1287	#############################################################################	1385	#############################################################################
1288		1386
1289	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
…		…
1473	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1474	can_hover => 1,	1572	can_hover => 1,
1475	can_focus => 1,	1573	can_focus => 1,
1476	valign => 0,	1574	valign => 0,
1477	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1478	@_	1577	@_
1479	)	1578	)
1480	}	1579	}
1481		1580
1482	sub _set_text {	1581	sub _set_text {
…		…
1492	$self->{text} = $text;	1591	$self->{text} = $text;
1493		1592
1494	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1495	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1496		1595
1497	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1498	}	1597	}
1499		1598
1500	sub set_text {	1599	sub set_text {
1501	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1502		1601
…		…
1514	my ($self) = @_;	1613	my ($self) = @_;
1515		1614
1516	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1517		1616
1518	($w + 1, $h) # add 1 for cursor	1617	($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	}	1618	}
1526		1619
1527	sub key_down {	1620	sub key_down {
1528	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1529		1622
…		…
1544	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1545	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1546	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1547	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1548	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1549	$self->emit ('escape');	1642	$self->_emit ('escape');
1550	} elsif ($uni) {	1643	} elsif ($uni) {
1551	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1552	}	1645	}
1553		1646
1554	$self->_set_text ($text);	1647	$self->_set_text ($text);
…		…
1641	if ($sym == 13) {	1734	if ($sym == 13) {
1642	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1643	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1644	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1645	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1646	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1647	$self->update;	1740	$self->update;
1648		1741
1649	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1650	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1651	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1699	can_events => 1,	1792	can_events => 1,
1700	@_	1793	@_
1701	)	1794	)
1702	}	1795	}
1703		1796
		1797	sub activate { }
		1798
1704	sub button_up {	1799	sub button_up {
1705	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1706		1801
		1802	$self->emit ("activate")
1707	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1708	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1709	$self->emit ("activate");
1710	}
1711	}	1805	}
1712		1806
1713	sub _draw {	1807	sub _draw {
1714	my ($self) = @_;	1808	my ($self) = @_;
1715		1809
…		…
1767	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1768		1862
1769	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1772	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1773	}	1867	}
1774	}	1868	}
1775		1869
1776	sub _draw {	1870	sub _draw {
1777	my ($self) = @_;	1871	my ($self) = @_;
…		…
2052	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2053	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2054	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
2055	bg => [0, 0, 0, 0.2],	2149	bg => [0, 0, 0, 0.2],
2056	active_bg => [1, 1, 1, 0.5],	2150	active_bg => [1, 1, 1, 0.5],
2057	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2058	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2059	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2060	vertical => 0,	2154	vertical => 0,
2061	can_hover => 1,	2155	can_hover => 1,
2062	inner_pad => .05,	2156	inner_pad => 0.02,
2063	@_	2157	@_
2064	);	2158	);
2065		2159
2066	$self->set_value ($self->{range}[0]);	2160	$self->set_value ($self->{range}[0]);
2067	$self->update;	2161	$self->update;
2068		2162
2069	$self	2163	$self
2070	}	2164	}
2071		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
2072	sub set_value {	2175	sub set_value {
2073	my ($self, $value) = @_;	2176	my ($self, $value) = @_;
2074		2177
2075	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076		2179
2077	$hi = $lo + 1 if $hi <= $lo;	2180	$hi = $lo + 1 if $hi <= $lo;
2078		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
2079	$value = $lo if $value < $lo;	2184	$value = $lo if $value < $lo;
2080	$value = $hi if $value > $hi;	2185	$value = $hi - $page if $value > $hi - $page;
2081		2186
2082	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083	if $unit;	2188	if $unit;
2084		2189
2085	$page = $hi - $lo if $page > $hi - $lo;
2086
2087	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088		2191
2089	if ($value != $old_value) {	2192	if ($value != $old_value) {
2090	$self->emit (changed => $value);	2193	$self->_emit (changed => $value);
2091	$self->update;	2194	$self->update;
2092	}	2195	}
2093	}	2196	}
2094		2197
2095	sub size_request {	2198	sub size_request {
…		…
2103		2206
2104	sub button_down {	2207	sub button_down {
2105	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2106		2209
2107	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
2108	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2109	}	2215	}
2110		2216
2111	sub mouse_motion {	2217	sub mouse_motion {
2112	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
…		…
2114	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
2115	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116		2222
2117	my (undef, $lo, $hi, $page) = @{$self->{range}};	2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
2118		2224
2119	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120		2226
2121	$self->set_value ($x * ($hi - $lo) + $lo);	2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122	}	2228	}
2123	}	2229	}
2124		2230
2125	sub update {	2231	sub update {
2126	my ($self) = @_;	2232	my ($self) = @_;
2127		2233
2128	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129	$self->set_value ($self->{range}[0]);	2235	$self->set_value ($self->{range}[0]);
2130		2236
2131	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2132		2239
2133	my $inner_w = 1 - 2 * $self->{inner_pad};	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134		2241
2135	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136		2244
2137	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2245	$value = ($value - $lo) / $range;
2138	$value = $self->{scale} * ($value - $lo);	2246	$value = $value * $self->{scale} + $self->{offset};
2139		2247
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;	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2146	$self->{knob_w} = $page;	2249	$self->{knob_w} = $knob_w;
2147	});	2250	});
2148		2251
2149	$self->SUPER::update;	2252	$self->SUPER::update;
2150	}	2253	}
2151		2254
…		…
2157	glScale $self->{w}, $self->{h};	2260	glScale $self->{w}, $self->{h};
2158		2261
2159	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2160	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2161		2264
		2265	glTranslate 1, 0, 0;
2162	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2163	glTranslate 0, 1, 0;
2164	}	2267	}
2165		2268
2166	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168		2271
…		…
2175	# draw handle	2278	# draw handle
2176	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177		2280
2178	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2179	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2180		2324
2181	#############################################################################	2325	#############################################################################
2182		2326
2183	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2184		2328
…		…
2214		2358
2215	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2216	$self->reflow;	2360	$self->reflow;
2217	}	2361	}
2218		2362
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 {	2363	sub size_allocate {
2239	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2240		2365
2241	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2242		2367
…		…
2245	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2246		2371
2247	$self->reflow;	2372	$self->reflow;
2248	}	2373	}
2249		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2250	sub add_paragraph {	2409	sub add_paragraph {
2251	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2252		2411
2253	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2254		2413	my ($w, $h) = $self->text_size ($line);
2255	my $height = $self->text_height ($text);
2256
2257	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2258		2417
2259	push @{$self->{par}}, [$height, $color, $text];
2260
2261	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262	$self->{children}[1]->update;
2263	}	2419	}
2264		2420
2265	sub update {	2421	sub update {
2266	my ($self) = @_;	2422	my ($self) = @_;
2267		2423
…		…
2270	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2271		2427
2272	delete $self->{texture};	2428	delete $self->{texture};
2273		2429
2274	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2275	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2434	my $height = 0;
2277		2435
2278	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2279	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2280		2451
2281	$self->{height} = $height;	2452	$self->{height} = $height;
2282		2453
2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284		2455
2285	delete $self->{texture};	2456	delete $self->{texture};
2286	}	2457	}
2287		2458
2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2291		2462
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];	2463	my $top = int $self->{children}[1]{range}[0];
2296		2464
2297	my $y0 = $top;	2465	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2299		2467
2300	my $y = 0;	2468	my $y = 0;
2301		2469
2302	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2303		2471
2304	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2305		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2306	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2307	my $h = $par->[0];	2479	my $h = $par->[1];
2308		2480
2309	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2310	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2311	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2312		2485
2313	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315	}	2490	}
2316		2491
2317	$y += $h;	2492	$y += $h;
2318	}	2493	}
2319		2494
2320	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2321	};	2496	};
2322	});	2497	});
2323	}	2498	}
2324		2499
2325	sub _draw {	2500	sub _draw {
2326	my ($self) = @_;	2501	my ($self) = @_;
2327		2502
2328	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2333		2508
2334	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2335		2510
2336	}	2511	}
…		…
2385		2560
2386	sub new {	2561	sub new {
2387	my $class = shift;	2562	my $class = shift;
2388		2563
2389	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2390	state => 0,	2565	state => 0,
2391	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2392	@_	2567	@_
2393	);	2568	);
2394		2569
2395	if ($self->{state}) {
2396	$self->{state} = 0;
2397	$self->toggle_flopper;
2398	}
2399
2400	$self	2570	$self
2401	}	2571	}
2402		2572
2403	sub toggle_flopper {	2573	sub toggle_flopper {
2404	my ($self) = @_;	2574	my ($self) = @_;
2405		2575
2406	# TODO: use animation	2576	$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	}	2577	}
2418		2578
2419	#############################################################################	2579	#############################################################################
2420		2580
2421	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2496	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2497		2657
2498	sub new {	2658	sub new {
2499	my $class = shift;	2659	my $class = shift;
2500		2660
2501	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2502	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2503	@_,	2664	@_,
2504	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2505	}	2682	}
2506		2683
2507	sub size_request {	2684	sub size_request {
2508	(32, 8)	2685	(32, 8)
2509	}	2686	}
2510		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2511	sub _draw {	2696	sub _draw {
2512	my ($self) = @_;	2697	my ($self) = @_;
2513		2698
2514	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516		2711
2517	# TODO animation
2518	if ($tex) {	2712	if ($tex) {
2519	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2524	}	2718	}
2525	}	2719	}
2526		2720
2527	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2528		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2529	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2530		2733
2531	our @ISA = CFClient::UI::HBox::;	2734	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		2735
2559	sub new {	2736	sub new {
2560	my $class = shift;	2737	my $class = shift;
2561		2738
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 (	2739	my $self = $class->SUPER::new (
2569	can_hover => 1,	2740	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	@_,	2741	@_,
2644	);	2742	);
2645		2743
2646	$self	2744	$self
2647	}	2745	}
…		…
2657	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2658	} @$items;	2756	} @$items;
2659		2757
2660	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2661		2759
		2760	my $row = 0;
2662	for my $item (@items) {	2761	for my $item (@items) {
2663	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	CFClient::Item::update_widgets $item;
2664	$item->update_item ();
2665	}
2666		2763
2667	$self->{scrolled}->add (@items);	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2668		2767
2669	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2768	$row++;
2670	}	2769	}
2671
2672	sub size_request {
2673	my ($self) = @_;
2674	($self->{req_w}, $self->{req_h});
2675	}	2770	}
2676		2771
2677	#############################################################################	2772	#############################################################################
2678		2773
2679	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2714		2809
2715	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2716	sub popup {	2811	sub popup {
2717	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2718		2813
2719	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2720		2815
2721	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2722	$GRAB = $self;	2817	$GRAB = $self;
2723	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2724		2819
…		…
2739		2834
2740	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2741	undef $GRAB;	2836	undef $GRAB;
2742	$self->hide;	2837	$self->hide;
2743		2838
2744	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2745	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2746	}	2841	}
2747	}	2842	}
2748		2843
2749	#############################################################################	2844	#############################################################################
…		…
2811	sub add {	2906	sub add {
2812	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2813		2908
2814	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2815	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2816		2913
2817	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2818		2915
2819	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820		2917
…		…
2864		2961
2865	sub new {	2962	sub new {
2866	my $class = shift;	2963	my $class = shift;
2867		2964
2868	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2869	@_,	2967	@_,
2870	)	2968	)
2871	}	2969	}
2872		2970
2873	sub configure {	2971	sub configure {
…		…
2891	}	2989	}
2892		2990
2893	sub size_allocate {	2991	sub size_allocate {
2894	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2895		2993
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) {	2994	for my $child ($self->children) {
2903	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904		2996
2905	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906	if exists $child->{req_x};	2998	if exists $child->{req_x};
2907		2999
2908	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909	if exists $child->{req_y};	3001	if exists $child->{req_y};
2910		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2911	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3005	$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;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913		3007
2914	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2915	}	3009	}
…		…
2936		3030
2937	sub add {	3031	sub add {
2938	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2939		3033
2940	for my $child (@children) {	3034	for my $child (@children) {
2941	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
2942		3036
2943	# integerise window positions	3037	# integerise window positions
2944	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2945	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
2946	}	3040	}
2947		3041
2948	$self->SUPER::add (@children);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2949	}	3061	}
2950		3062
2951	sub on_refresh {	3063	sub on_refresh {
2952	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2953		3065
…		…
2967	$_->()	3079	$_->()
2968	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2969	}	3081	}
2970		3082
2971	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2972	my @queue = ([], []);	3084	my @queue;
2973		3085
2974	for (;;) {	3086	for (;;) {
2975	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2976	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2977	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2978	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2979	}	3092	}
2980		3093
2981	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2982		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2983	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2984	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2985	: $widget->size_request;	3100	: $widget->size_request;
2986		3101
2987	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2988	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3006	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
3007	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
3008		3123
3009	$widget->{w} = $w;	3124	$widget->{w} = $w;
3010	$widget->{h} = $h;	3125	$widget->{h} = $h;
3011	$widget->size_allocate ($w, $h);
3012	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
3013	}	3127	}
3014	}	3128	}
3015		3129
3016	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
3024		3138
3025	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
3026	glLoadIdentity;	3140	glLoadIdentity;
3027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
3029	glLoadIdentity;	3143	glLoadIdentity;
3030		3144
3031	$self->_draw;	3145	$self->_draw;
3032	}	3146	}

Diff Legend

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