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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	185	}
156
157	$widget->reconfigure;
158	}	186	}
		187
		188	reconfigure_widgets;
159	}	189	}
160		190
161	#############################################################################	191	#############################################################################
162		192
163	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
176	can_events => 1,	206	can_events => 1,
177	@_	207	@_
178	}, $class;	208	}, $class;
179		209
180	for (keys %$self) {	210	for (keys %$self) {
181	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
183	}	213	}
184	}	214	}
185		215
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
188	$self	225	$self
189	}	226	}
190		227
191	sub destroy {	228	sub destroy {
192	my ($self) = @_;	229	my ($self) = @_;
…		…
195	%$self = ();	232	%$self = ();
196	}	233	}
197		234
198	sub show {	235	sub show {
199	my ($self) = @_;	236	my ($self) = @_;
200
201	return if $self->{parent};	237	return if $self->{parent};
202		238
203	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
204	}	240	}
205		241
206	sub hide {	242	sub show_centered {
207	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	return unless $self->{visible};
		259
		260	# broken show/hide model
		261
		262	delete $self->{root};
		263	delete $self->{visible};
208		264
209	undef $GRAB if $GRAB == $self;	265	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	266	undef $HOVER if $HOVER == $self;
		267
		268	CFClient::UI::check_tooltip
		269	if $CFClient::UI::TOOLTIP->{owner} == $self;
		270
		271	$self->focus_out;
		272
		273	$self->emit (visibility_change => 0);
		274	}
		275
		276	sub hide {
		277	my ($self) = @_;
		278
		279	$self->set_invisible;
211		280
212	$self->{parent}->remove ($self)	281	$self->{parent}->remove ($self)
213	if $self->{parent};	282	if $self->{parent};
214	}	283	}
215		284
…		…
285	}	354	}
286		355
287	sub set_tooltip {	356	sub set_tooltip {
288	my ($self, $tooltip) = @_;	357	my ($self, $tooltip) = @_;
289		358
		359	$tooltip =~ s/^\s+//;
		360	$tooltip =~ s/\s+$//;
		361
		362	return if $self->{tooltip} eq $tooltip;
		363
290	$self->{tooltip} = $tooltip;	364	$self->{tooltip} = $tooltip;
291		365
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	366	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	367	delete $CFClient::UI::TOOLTIP->{owner};
294	CFClient::UI::check_tooltip;	368	CFClient::UI::check_tooltip;
…		…
315	return if $FOCUS == $self;	389	return if $FOCUS == $self;
316	return unless $self->{can_focus};	390	return unless $self->{can_focus};
317		391
318	my $focus = $FOCUS; $FOCUS = $self;	392	my $focus = $FOCUS; $FOCUS = $self;
319		393
320	$self->emit (focus_in => $focus);	394	$self->_emit (focus_in => $focus);
321		395
322	$focus->update if $focus;	396	$focus->update if $focus;
323	$FOCUS->update;	397	$FOCUS->update;
324	}	398	}
325		399
…		…
328		402
329	return unless $FOCUS == $self;	403	return unless $FOCUS == $self;
330		404
331	my $focus = $FOCUS; undef $FOCUS;	405	my $focus = $FOCUS; undef $FOCUS;
332		406
333	$self->emit (focus_out => $focus);	407	$self->_emit (focus_out => $focus);
334		408
335	$focus->update if $focus; #?	409	$focus->update if $focus; #?
		410
		411	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		412	unless $FOCUS;
336	}	413	}
337		414
338	sub mouse_motion { }	415	sub mouse_motion { }
339	sub button_up { }	416	sub button_up { }
340	sub key_down { }	417	sub key_down { }
341	sub key_up { }	418	sub key_up { }
342		419
343	sub button_down {	420	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	421	my ($self, $ev, $x, $y) = @_;
345		422
346	$self->focus_in;	423	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	457	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	458	glPushMatrix;
382	glColor 1, 1, 0, 1;	459	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	461	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	462	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	463	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	464	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	465	glVertex 0 , $self->{h} - 1;
389	glEnd;	466	glEnd;
390	glPopMatrix;	467	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	468	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	469	}
393	}	470	}
…		…
413	sub set_parent {	490	sub set_parent {
414	my ($self, $parent) = @_;	491	my ($self, $parent) = @_;
415		492
416	Scalar::Util::weaken ($self->{parent} = $parent);	493	Scalar::Util::weaken ($self->{parent} = $parent);
417		494
		495	if ($parent->{visible} || 1) {
		496	$self->{root} = $parent->{root};
		497	$self->{visible} = $parent->{visible} + 1;
		498
		499	$self->emit (visibility_change => 1)
		500	unless $self->{parent}{visible};
		501	}
		502
418	# TODO: req_w _does_change after ->reconfigure	503	# TODO: req_w _does_change after ->reconfigure
419	$self->check_size	504	$self->check_size
420	unless exists $self->{req_w};	505	unless exists $self->{req_w};
		506
		507	$self->show;
421	}	508	}
422		509
423	sub check_size {	510	sub check_size {
424	my ($self, $forced) = @_;	511	my ($self, $forced) = @_;
425		512
…		…
438	my ($self, $signal, $cb) = @_;	525	my ($self, $signal, $cb) = @_;
439		526
440	push @{ $self->{signal_cb}{$signal} }, $cb;	527	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	528	}
442		529
		530	sub _emit {
		531	my ($self, $signal, @args) = @_;
		532
		533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		534	}
		535
443	sub emit {	536	sub emit {
444	my ($self, $signal, @args) = @_;	537	my ($self, $signal, @args) = @_;
445		538
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	539	$self->_emit ($signal, @args)
		540	|| $self->$signal (@args);
		541	}
		542
		543	sub visibility_change {
		544	#my ($self, $visible) = @_;
447	}	545	}
448		546
449	sub DESTROY {	547	sub DESTROY {
450	my ($self) = @_;	548	my ($self) = @_;
451		549
…		…
564	delete $child->{parent};	662	delete $child->{parent};
565	$child->hide;	663	$child->hide;
566		664
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		666
569	$self->check_size;	667	$self->check_size (1);
570	$self->update;	668	$self->update;
571	}	669	}
572		670
573	sub clear {	671	sub clear {
574	my ($self) = @_;	672	my ($self) = @_;
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	787	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	788	glClear GL_COLOR_BUFFER_BIT;
691		789
692	$self->_render;	790	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	791	};
701	}	792	}
702		793
703	sub _draw {	794	sub _draw {
704	my ($self) = @_;	795	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	799	my $tex = $self->{texture}
709	or return;	800	or return;
710		801
711	glEnable GL_TEXTURE_2D;	802	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	803	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	804	glColor 1, 1, 1, 1;
714		805
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	806	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		807
717	glDisable GL_TEXTURE_2D;	808	glDisable GL_TEXTURE_2D;
718	}	809	}
…		…
721		812
722	package CFClient::UI::ViewPort;	813	package CFClient::UI::ViewPort;
723		814
724	our @ISA = CFClient::UI::Window::;	815	our @ISA = CFClient::UI::Window::;
725		816
		817	sub new {
		818	my $class = shift;
		819
		820	$class->SUPER::new (
		821	scroll_x => 0,
		822	scroll_y => 1,
		823	@_,
		824	)
		825	}
		826
726	sub size_request {	827	sub size_request {
727	my ($self) = @_;	828	my ($self) = @_;
728		829
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		831
732	@$self{qw(child_w child_h)}	832	@$self{qw(child_w child_h)}
733	}	833	}
734		834
735	sub size_allocate {	835	sub size_allocate {
736	my ($self, $w, $h) = @_;	836	my ($self, $w, $h) = @_;
737		837
		838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		840
		841	$self->child->configure (0, 0, $w, $h);
738	$self->update;	842	$self->update;
739	}	843	}
740		844
741	sub set_offset {	845	sub set_offset {
742	my ($self, $x, $y) = @_;	846	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	897	my $class = shift;
794		898
795	my $self;	899	my $self;
796		900
797	my $slider = new CFClient::UI::Slider	901	my $slider = new CFClient::UI::Slider
798	vertical => 1,	902	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	903	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	904	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	905	$self->{vp}->set_offset (0, $_[1]);
802	},	906	},
803	;	907	;
804		908
805	$self = $class->SUPER::new (	909	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	910	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	911	slider => $slider,
808	@_,	912	@_,
809	);	913	);
810		914
811	$self->{vp}->add ($self->{scrolled});	915	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	916	$self->add ($self->{vp});
813	$self->add ($self->{slider});	917	$self->add ($self->{slider});
814		918
815	$self	919	$self
		920	}
		921
		922	sub update {
		923	my ($self) = @_;
		924
		925	$self->SUPER::update;
		926
		927	# todo: overwrite size_allocate of child
		928	my $child = $self->{vp}->child;
		929	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		930	}
		931
		932	sub size_allocate {
		933	my ($self, $w, $h) = @_;
		934
		935	$self->SUPER::size_allocate ($w, $h);
		936
		937	my $child = $self->{vp}->child;
		938	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	939	}
817		940
818	#TODO# update range on size_allocate depending on child	941	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	942	# update viewport offset on scroll
820		943
…		…
874	my $class = shift;	997	my $class = shift;
875		998
876	# TODO: user_x, user_y, overwrite moveto?	999	# TODO: user_x, user_y, overwrite moveto?
877		1000
878	my $self = $class->SUPER::new (	1001	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1002	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1003	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1004	border => 0.6,
882	toplevel => 1,	1005	is_toplevel => 1,
883	can_events => 1,	1006	can_events => 1,
884	@_	1007	@_
885	);	1008	);
886		1009
887	$self->{title} &&= new CFClient::UI::Label	1010	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1011	align => 0,
…		…
941	my ($ev, $x, $y) = @_;	1064	my ($ev, $x, $y) = @_;
942		1065
943	my $dx = $ev->{x} - $ox;	1066	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1067	my $dy = $ev->{y} - $oy;
945		1068
		1069	$self->{user_x} = $wx + $dx * $mx;
		1070	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1073	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1074	$self->check_size;
950	};	1075	};
951		1076
952	} elsif ($lr ^ $td) {	1077	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
956	$self->{motion} = sub {	1081	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
958		1083
959	($x, $y) = ($ev->{x}, $ev->{y});	1084	($x, $y) = ($ev->{x}, $ev->{y});
960		1085
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1086	$self->{user_x} = $bx + $x - $ox;
		1087	$self->{user_y} = $by + $y - $oy;
		1088	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1089	$self->update;
963	};	1090	};
964	}	1091	}
965	}	1092	}
966		1093
…		…
1028	sub new {	1155	sub new {
1029	my $class = shift;	1156	my $class = shift;
1030		1157
1031	$class->SUPER::new (	1158	$class->SUPER::new (
1032	col_expand => [],	1159	col_expand => [],
1033	@_	1160	@_,
1034	)	1161	)
		1162	}
		1163
		1164	sub children {
		1165	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1166	}
1036		1167
1037	sub add {	1168	sub add {
1038	my ($self, $x, $y, $child) = @_;	1169	my ($self, $x, $y, $child) = @_;
1039		1170
1040	$child->set_parent ($self);	1171	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1172	$self->{children}[$y][$x] = $child;
1042		1173
1043	$child->check_size;	1174	$self->check_size (1);
1044	}	1175	}
1045		1176
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1177	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1178	sub clear {
1052	my ($self) = @_;	1179	my ($self) = @_;
1053		1180
1054	my @children = $self->children;	1181	my @children = $self->children;
1055	delete $self->{children};	1182	delete $self->{children};
…		…
1057	for (@children) {	1184	for (@children) {
1058	delete $_->{parent};	1185	delete $_->{parent};
1059	$_->hide;	1186	$_->hide;
1060	}	1187	}
1061		1188
		1189	$self->check_size (1);
1062	$self->update;	1190	$self->update;
1063	}	1191	}
1064		1192
1065	sub get_wh {	1193	sub get_wh {
1066	my ($self) = @_;	1194	my ($self) = @_;
…		…
1098	sub size_allocate {	1226	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1227	my ($self, $w, $h) = @_;
1100		1228
1101	my ($ws, $hs) = $self->get_wh;	1229	my ($ws, $hs) = $self->get_wh;
1102		1230
1103	my $req_w = sum @$ws;	1231	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1232	my $req_h = (sum @$hs) || 1;
1105		1233
1106	# TODO: nicer code && do row_expand	1234	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1235	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1236	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1237	my $col_expand = (sum @col_expand) || 1;
…		…
1297	#bg => none	1425	#bg => none
1298	#active_bg => none	1426	#active_bg => none
1299	#font => default_font	1427	#font => default_font
1300	#text => initial text	1428	#text => initial text
1301	#markup => initial narkup	1429	#markup => initial narkup
		1430	#max_w => maximum pixel width
		1431	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1432	layout => (new CFClient::Layout),
1303	fontsize => 1,	1433	fontsize => 1,
1304	align => -1,	1434	align => -1,
1305	valign => -1,	1435	valign => -1,
1306	padding => 2,	1436	padding => 2,
…		…
1371	sub size_request {	1501	sub size_request {
1372	my ($self) = @_;	1502	my ($self) = @_;
1373		1503
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1504	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1505	$self->{layout}->set_width ($self->{max_w} || -1);
		1506	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1507	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1509
1378	my ($w, $h) = $self->{layout}->size;	1510	my ($w, $h) = $self->{layout}->size;
1379		1511
1380	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1416		1548
1417	my $tex = $self->{texture} ||= do {	1549	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1550	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1551	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1552	$self->{layout}->set_width ($self->{w});
		1553	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1556
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1557	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1558
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1598	active_fg => [0, 0, 0],
1465	can_hover => 1,	1599	can_hover => 1,
1466	can_focus => 1,	1600	can_focus => 1,
1467	valign => 0,	1601	valign => 0,
1468	can_events => 1,	1602	can_events => 1,
		1603	#text => ...
1469	@_	1604	@_
1470	)	1605	)
1471	}	1606	}
1472		1607
1473	sub _set_text {	1608	sub _set_text {
…		…
1483	$self->{text} = $text;	1618	$self->{text} = $text;
1484		1619
1485	$text =~ s/./*/g if $self->{hidden};	1620	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1621	$self->{layout}->set_text ("$text ");
1487		1622
1488	$self->emit (changed => $self->{text});	1623	$self->_emit (changed => $self->{text});
1489	}	1624	}
1490		1625
1491	sub set_text {	1626	sub set_text {
1492	my ($self, $text) = @_;	1627	my ($self, $text) = @_;
1493		1628
…		…
1505	my ($self) = @_;	1640	my ($self) = @_;
1506		1641
1507	my ($w, $h) = $self->SUPER::size_request;	1642	my ($w, $h) = $self->SUPER::size_request;
1508		1643
1509	($w + 1, $h) # add 1 for cursor	1644	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1645	}
1517		1646
1518	sub key_down {	1647	sub key_down {
1519	my ($self, $ev) = @_;	1648	my ($self, $ev) = @_;
1520		1649
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1664	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1665	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1666	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1667	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1668	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1669	$self->_emit ('escape');
1541	} elsif ($uni) {	1670	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1671	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1672	}
1544		1673
1545	$self->_set_text ($text);	1674	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1761	if ($sym == 13) {
1633	unshift @{$self->{history}},	1762	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1763	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1764	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1765	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1766	$self->_emit (activate => $txt);
1638	$self->update;	1767	$self->update;
1639		1768
1640	} elsif ($sym == CFClient::SDLK_UP) {	1769	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1770	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1771	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1819	can_events => 1,
1691	@_	1820	@_
1692	)	1821	)
1693	}	1822	}
1694		1823
		1824	sub activate { }
		1825
1695	sub button_up {	1826	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1827	my ($self, $ev, $x, $y) = @_;
1697		1828
		1829	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1830	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1831	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1832	}
1703		1833
1704	sub _draw {	1834	sub _draw {
1705	my ($self) = @_;	1835	my ($self) = @_;
1706		1836
…		…
1758	my ($self, $ev, $x, $y) = @_;	1888	my ($self, $ev, $x, $y) = @_;
1759		1889
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1892	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1893	$self->_emit (changed => $self->{state});
1764	}	1894	}
1765	}	1895	}
1766		1896
1767	sub _draw {	1897	sub _draw {
1768	my ($self) = @_;	1898	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2173	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2174	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2175	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2176	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2177	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2178	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2179	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2180	req_h => $::WIDTH / 80,
2051	vertical => 0,	2181	vertical => 0,
2052	can_hover => 1,	2182	can_hover => 1,
2053	inner_pad => .05,	2183	inner_pad => 0.02,
2054	@_	2184	@_
2055	);	2185	);
2056		2186
2057	$self->set_value ($self->{range}[0]);	2187	$self->set_value ($self->{range}[0]);
2058	$self->update;	2188	$self->update;
2059		2189
2060	$self	2190	$self
2061	}	2191	}
2062		2192
		2193	sub set_range {
		2194	my ($self, $range) = @_;
		2195
		2196	($range, $self->{range}) = ($self->{range}, $range);
		2197
		2198	$self->update
		2199	if "@$range" ne "@{$self->{range}}";
		2200	}
		2201
2063	sub set_value {	2202	sub set_value {
2064	my ($self, $value) = @_;	2203	my ($self, $value) = @_;
2065		2204
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2205	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2206
2068	$hi = $lo + 1 if $hi <= $lo;	2207	$hi = $lo + 1 if $hi <= $lo;
2069		2208
		2209	$page = $hi - $lo if $page > $hi - $lo;
		2210
2070	$value = $lo if $value < $lo;	2211	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2212	$value = $hi - $page if $value > $hi - $page;
2072		2213
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2214	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2215	if $unit;
2075		2216
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2217	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2218
2080	if ($value != $old_value) {	2219	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2220	$self->_emit (changed => $value);
2082	$self->update;	2221	$self->update;
2083	}	2222	}
2084	}	2223	}
2085		2224
2086	sub size_request {	2225	sub size_request {
…		…
2094		2233
2095	sub button_down {	2234	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2097		2236
2098	$self->SUPER::button_down ($ev, $x, $y);	2237	$self->SUPER::button_down ($ev, $x, $y);
		2238
		2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2240
2099	$self->mouse_motion ($ev, $x, $y);	2241	$self->mouse_motion ($ev, $x, $y);
2100	}	2242	}
2101		2243
2102	sub mouse_motion {	2244	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2247	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2248	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2249
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2250	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2251
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2253
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2255	}
2114	}	2256	}
2115		2257
2116	sub update {	2258	sub update {
2117	my ($self) = @_;	2259	my ($self) = @_;
2118		2260
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2262	$self->set_value ($self->{range}[0]);
2121		2263
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2264	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2265	my $range = ($hi - $page - $lo) || 1e-100;
2123		2266
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2267	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2268
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2269	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2270	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2271
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2272	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2273	$value = $value * $self->{scale} + $self->{offset};
2130		2274
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2275	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2276	$self->{knob_w} = $knob_w;
2138	});	2277	});
2139		2278
2140	$self->SUPER::update;	2279	$self->SUPER::update;
2141	}	2280	}
2142		2281
…		…
2148	glScale $self->{w}, $self->{h};	2287	glScale $self->{w}, $self->{h};
2149		2288
2150	if ($self->{vertical}) {	2289	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2290	# draw a vertical slider like a rotated horizontal slider
2152		2291
		2292	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2293	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2294	}
2156		2295
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2296	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2297	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2298
…		…
2166	# draw handle	2305	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2306	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2307
2169	glDisable GL_TEXTURE_2D;	2308	glDisable GL_TEXTURE_2D;
2170	}	2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFClient::UI::ValSlider;
		2314
		2315	our @ISA = CFClient::UI::HBox::;
		2316
		2317	sub new {
		2318	my ($class, %arg) = @_;
		2319
		2320	my $range = delete $arg{range};
		2321
		2322	my $self = $class->SUPER::new (
		2323	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2324	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2325	to_value => sub { shift },
		2326	from_value => sub { shift },
		2327	%arg,
		2328	);
		2329
		2330	$self->{slider}->connect (changed => sub {
		2331	my ($self, $value) = @_;
		2332	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2333	$self->{parent}->emit (changed => $value);
		2334	});
		2335
		2336	# $self->{entry}->connect (changed => sub {
		2337	# my ($self, $value) = @_;
		2338	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2339	# $self->{parent}->emit (changed => $value);
		2340	# });
		2341
		2342	$self->add ($self->{slider}, $self->{entry});
		2343
		2344	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2345
		2346	$self
		2347	}
		2348
		2349	sub set_range { shift->{slider}->set_range (@_) }
		2350	sub set_value { shift->{slider}->set_value (@_) }
2171		2351
2172	#############################################################################	2352	#############################################################################
2173		2353
2174	package CFClient::UI::TextView;	2354	package CFClient::UI::TextView;
2175		2355
…		…
2205		2385
2206	$self->{fontsize} = $fontsize;	2386	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2387	$self->reflow;
2208	}	2388	}
2209		2389
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2390	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2391	my ($self, $w, $h) = @_;
2231		2392
2232	$self->SUPER::size_allocate ($w, $h);	2393	$self->SUPER::size_allocate ($w, $h);
2233		2394
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2397	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2398
2238	$self->reflow;	2399	$self->reflow;
2239	}	2400	}
2240		2401
		2402	sub text_size {
		2403	my ($self, $text, $indent) = @_;
		2404
		2405	my $layout = $self->{layout};
		2406
		2407	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2408	$layout->set_width ($self->{children}[0]{w} - $indent);
		2409	$layout->set_markup ($text);
		2410
		2411	$layout->size
		2412	}
		2413
		2414	sub reflow {
		2415	my ($self) = @_;
		2416
		2417	$self->{need_reflow}++;
		2418	$self->update;
		2419	}
		2420
		2421	sub set_offset {
		2422	my ($self, $offset) = @_;
		2423
		2424	# todo: base offset on lines or so, not on pixels
		2425	$self->{children}[1]->set_value ($offset);
		2426	}
		2427
		2428	sub clear {
		2429	my ($self) = @_;
		2430
		2431	$self->{par} = [];
		2432	$self->{height} = 0;
		2433	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2434	}
		2435
2241	sub add_paragraph {	2436	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2437	my ($self, $color, $text, $indent) = @_;
2243		2438
2244	#TODO: intelligently "reformat" paragraph	2439	for my $line (split /\n/, $text) {
2245		2440	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2441	$self->{height} += $h;
		2442	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2443	}
2249		2444
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2445	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2446	}
2255		2447
2256	sub update {	2448	sub update {
2257	my ($self) = @_;	2449	my ($self) = @_;
2258		2450
…		…
2261	return unless $self->{h} > 0;	2453	return unless $self->{h} > 0;
2262		2454
2263	delete $self->{texture};	2455	delete $self->{texture};
2264		2456
2265	$ROOT->on_post_alloc ($self, sub {	2457	$ROOT->on_post_alloc ($self, sub {
		2458	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2459
2266	if (delete $self->{need_reflow}) {	2460	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2461	my $height = 0;
2268		2462
2269	$height += $_->[0] = $self->text_height ($_->[2])	2463	my $layout = $self->{layout};
		2464
		2465	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2466
2270	for @{$self->{par}};	2467	for (@{$self->{par}}) {
		2468	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2469	$layout->set_width ($W - $_->[3]);
		2470	$layout->set_markup ($_->[4]);
		2471	my ($w, $h) = $layout->size;
		2472	$_->[0] = $w + $_->[3];
		2473	$_->[1] = $h;
		2474	}
		2475
		2476	$height += $_->[1];
		2477	}
2271		2478
2272	$self->{height} = $height;	2479	$self->{height} = $height;
2273		2480
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2481	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2482
2276	delete $self->{texture};	2483	delete $self->{texture};
2277	}	2484	}
2278		2485
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2486	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2487	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2488	glClear GL_COLOR_BUFFER_BIT;
2282		2489
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2490	my $top = int $self->{children}[1]{range}[0];
2287		2491
2288	my $y0 = $top;	2492	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2493	my $y1 = $top + $H;
2290		2494
2291	my $y = 0;	2495	my $y = 0;
2292		2496
2293	my $layout = $self->{layout};	2497	my $layout = $self->{layout};
2294		2498
2295	$layout->set_font ($self->{font}) if $self->{font};	2499	$layout->set_font ($self->{font}) if $self->{font};
2296		2500
		2501	glEnable GL_BLEND;
		2502	#TODO# not correct in windows where rgba is forced off
		2503	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2504
2297	for my $par (@{$self->{par}}) {	2505	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2506	my $h = $par->[1];
2299		2507
2300	if ($y0 < $y + $h && $y < $y1) {	2508	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2509	$layout->set_foreground (@{ $par->[2] });
		2510	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2511	$layout->set_markup ($par->[4]);
2303		2512
2304	my ($W, $H) = $layout->size;	2513	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2514
		2515	glRasterPos $par->[3], $y - $y0;
		2516	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2517	}
2307		2518
2308	$y += $h;	2519	$y += $h;
2309	}	2520	}
2310		2521
2311	glDisable GL_TEXTURE_2D;	2522	glDisable GL_BLEND;
2312	};	2523	};
2313	});	2524	});
2314	}	2525	}
2315		2526
2316	sub _draw {	2527	sub _draw {
2317	my ($self) = @_;	2528	my ($self) = @_;
2318		2529
2319	glEnable GL_TEXTURE_2D;	2530	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2532	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2533	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2534	glDisable GL_TEXTURE_2D;
2324		2535
2325	$self->{children}[1]->draw;	2536	$self->{children}[1]->draw;
2326		2537
2327	}	2538	}
…		…
2376		2587
2377	sub new {	2588	sub new {
2378	my $class = shift;	2589	my $class = shift;
2379		2590
2380	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2381	state => 0,	2592	state => 0,
2382	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2383	@_	2594	@_
2384	);	2595	);
2385		2596
2386	if ($self->{state}) {	2597	if ($self->{state}) {
2387	$self->{state} = 0;	2598	$self->{state} = 0;
…		…
2396		2607
2397	# TODO: use animation	2608	# TODO: use animation
2398	if ($self->{state} = !$self->{state}) {	2609	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});	2610	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));	2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");	2612	$self->_emit ("open");
2402	} else {	2613	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});	2614	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");	2615	$self->_emit ("close");
2405	}	2616	}
2406		2617
2407	$self->emit (changed => $self->{state});	2618	$self->_emit (changed => $self->{state});
2408	}	2619	}
2409		2620
2410	#############################################################################	2621	#############################################################################
2411		2622
2412	package CFClient::UI::Tooltip;	2623	package CFClient::UI::Tooltip;
…		…
2426		2637
2427	sub set_tooltip_from {	2638	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2639	my ($self, $widget) = @_;
2429		2640
2430	$self->add (new CFClient::UI::Label	2641	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2642	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2644	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2645	fg => [0, 0, 0, 1],
		2646	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2647	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2648	);
2437	}	2649	}
2438		2650
2439	sub size_request {	2651	sub size_request {
2440	my ($self) = @_;	2652	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2698	use CFClient::OpenGL;
2487		2699
2488	sub new {	2700	sub new {
2489	my $class = shift;	2701	my $class = shift;
2490		2702
2491	$class->SUPER::new (	2703	my $self = $class->SUPER::new (
2492	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2493	@_,	2706	@_,
2494	)	2707	);
		2708
		2709	if ($self->{anim} && $self->{animspeed}) {
		2710	Scalar::Util::weaken (my $widget = $self);
		2711
		2712	$self->{timer} = Event->timer (
		2713	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2714	hard => 1,
		2715	interval => $self->{animspeed},
		2716	cb => sub {
		2717	++$widget->{frame};
		2718	$widget->update;
		2719	},
		2720	);
		2721	}
		2722
		2723	$self
2495	}	2724	}
2496		2725
2497	sub size_request {	2726	sub size_request {
2498	(32, 8)	2727	(32, 8)
2499	}	2728	}
2500		2729
		2730	sub update {
		2731	my ($self) = @_;
		2732
		2733	return unless $self->{visible};
		2734
		2735	$self->SUPER::update;
		2736	}
		2737
2501	sub _draw {	2738	sub _draw {
2502	my ($self) = @_;	2739	my ($self) = @_;
2503		2740
2504	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
		2742
		2743	my $face;
		2744
		2745	if ($self->{frame}) {
		2746	my $anim = $::CONN->{anim}[$self->{anim}];
		2747
		2748	$face = $anim->[ $self->{frame} % @$anim ]
		2749	if $anim && @$anim;
		2750	}
		2751
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2753
2507	# TODO animation
2508	if ($tex) {	2754	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2755	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2757	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2514	}	2760	}
2515	}	2761	}
2516		2762
		2763	sub DESTROY {
		2764	my ($self) = @_;
		2765
		2766	$self->{timer}->cancel
		2767	if $self->{timer};
		2768
		2769	$self->SUPER::DESTROY;
		2770	}
		2771
2517	#############################################################################	2772	#############################################################################
2518		2773
2519	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2520		2775
2521	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2522		2777
2523	sub new {	2778	sub new {
2524	my $class = shift;	2779	my $class = shift;
2525		2780
2526	my %args = @_;
2527
2528	my $item = delete $args{item};
2529
2530	my $desc = $item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2550	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551	can_events => 1,
2552	tooltip => ((CFClient::UI::Label::escape $desc)
2553	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554	connect_button_down => sub {
2555	my ($self, $ev, $x, $y) = @_;
2556
2557	# todo: maybe put examine on 1? but should just be a tooltip :(
2558	if ($ev->{button} == 1) {
2559	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560	} elsif ($ev->{button} == 2) {
2561	$::CONN->send ("apply $item->{tag}");
2562	} elsif ($ev->{button} == 3) {
2563	my @menu_items = (
2564	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568	[
2569	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571	],
2572	);
2573
2574	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575	}
2576
2577	1
2578	},
2579	%args
2580	);
2581
2582	$self->add (new CFClient::UI::Face
2583	can_events => 0,
2584	face => $item->{face},
2585	anim => $item->{anim},
2586	animspeed => $item->{animspeed},
2587	);
2588
2589	$self->add (new CFClient::UI::Label
2590	can_events => 0,
2591	text => $desc,
2592	);
2593
2594	$self
2595	}
2596
2597	#############################################################################
2598
2599	package CFClient::UI::Inventory;
2600
2601	our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603	sub new {
2604	my $class = shift;
2605
2606	my $self = $class->SUPER::new (
2607	scrolled => (new CFClient::UI::VBox),
2608	@_,	2783	@_,
2609	);	2784	);
2610		2785
2611	$self	2786	$self
2612	}	2787	}
…		…
2622	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2623	} @$items;	2798	} @$items;
2624		2799
2625	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2626		2801
		2802	my $row = 0;
2627	for my $item (@items) {	2803	for my $item (@items) {
2628	my $desc = $item->{nrof} < 2	2804	CFClient::Item::update_widgets $item;
2629	? $item->{name}
2630	: "$item->{nrof} $item->{name_pl}";
2631		2805
2632	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2633	}	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2634		2809
2635	$self->{scrolled}->add (@items);	2810	$row++;
2636		2811	}
2637	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638	}	2812	}
2639		2813
2640	sub size_request {	2814	sub size_request {
2641	my ($self) = @_;	2815	my ($self) = @_;
2642	($self->{req_w}, $self->{req_h});	2816	($self->{req_w}, $self->{req_h});
…		…
2682		2856
2683	# popup given the event (must be a mouse button down event currently)	2857	# popup given the event (must be a mouse button down event currently)
2684	sub popup {	2858	sub popup {
2685	my ($self, $ev) = @_;	2859	my ($self, $ev) = @_;
2686		2860
2687	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2688		2862
2689	# maybe save $GRAB? must be careful about events...	2863	# maybe save $GRAB? must be careful about events...
2690	$GRAB = $self;	2864	$GRAB = $self;
2691	$self->{button} = $ev->{button};	2865	$self->{button} = $ev->{button};
2692		2866
…		…
2707		2881
2708	if ($ev->{button} == $self->{button}) {	2882	if ($ev->{button} == $self->{button}) {
2709	undef $GRAB;	2883	undef $GRAB;
2710	$self->hide;	2884	$self->hide;
2711		2885
2712	$self->emit ("popdown");	2886	$self->_emit ("popdown");
2713	$self->{hover}[1]->() if $self->{hover};	2887	$self->{hover}[1]->() if $self->{hover};
2714	}	2888	}
2715	}	2889	}
2716		2890
2717	#############################################################################	2891	#############################################################################
…		…
2752	# TODO: doesn't handle markup well (read as: at all)	2926	# TODO: doesn't handle markup well (read as: at all)
2753	my $short = $item->{count} > 1	2927	my $short = $item->{count} > 1
2754	? "<b>$item->{count} ×</b> $item->{text}"	2928	? "<b>$item->{count} ×</b> $item->{text}"
2755	: $item->{text};	2929	: $item->{text};
2756		2930
2757	my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759	for ($short) {	2931	for ($short) {
2760	s/^\s+//;	2932	s/^\s+//;
2761	s/\s+/ /g;	2933	s/\s+/ /g;
2762	my $len = int 40 / $fontsize;
2763	substr $_, $len, length, "…" if $len < length;
2764	}	2934	}
2765		2935
2766	new CFClient::UI::Label	2936	new CFClient::UI::Label
2767	markup => $short,	2937	markup => $short,
2768	tooltip => $item->{tooltip},	2938	tooltip => $item->{tooltip},
2769	tooltip_font => $::FONT_PROP,	2939	tooltip_font => $::FONT_PROP,
2770	tooltip_width => 0.67,	2940	tooltip_width => 0.67,
2771	fontsize => $fontsize,	2941	fontsize => $item->{fontsize} || $self->{fontsize},
		2942	max_w => $::WIDTH * 0.44,
2772	fg => $item->{fg},	2943	fg => $item->{fg},
2773	can_events => 1,	2944	can_events => 1,
2774	can_hover => 1	2945	can_hover => 1
2775	};	2946	};
2776	}	2947	}
…		…
2782	sub add {	2953	sub add {
2783	my ($self, $text, %arg) = @_;	2954	my ($self, $text, %arg) = @_;
2784		2955
2785	$text =~ s/^\s+//;	2956	$text =~ s/^\s+//;
2786	$text =~ s/\s+$//;	2957	$text =~ s/\s+$//;
		2958
		2959	return unless $text;
2787		2960
2788	my $timeout = time + ((delete $arg{timeout}) || 60);	2961	my $timeout = time + ((delete $arg{timeout}) || 60);
2789		2962
2790	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2963	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2791		2964
…		…
2813	}	2986	}
2814		2987
2815	$self->reorder;	2988	$self->reorder;
2816	}	2989	}
2817		2990
		2991	sub reconfigure {
		2992	my ($self) = @_;
		2993
		2994	delete $_->{label}
		2995	for values %{ $self->{item} || {} };
		2996
		2997	$self->reorder;
		2998	$self->SUPER::reconfigure;
		2999	}
		3000
2818	#############################################################################	3001	#############################################################################
2819		3002
2820	package CFClient::UI::Root;	3003	package CFClient::UI::Root;
2821		3004
2822	our @ISA = CFClient::UI::Container::;	3005	our @ISA = CFClient::UI::Container::;
…		…
2825		3008
2826	sub new {	3009	sub new {
2827	my $class = shift;	3010	my $class = shift;
2828		3011
2829	$class->SUPER::new (	3012	$class->SUPER::new (
		3013	visible => 1,
2830	@_,	3014	@_,
2831	)	3015	)
2832	}	3016	}
2833		3017
2834	sub configure {	3018	sub configure {
…		…
2852	}	3036	}
2853		3037
2854	sub size_allocate {	3038	sub size_allocate {
2855	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2856		3040
2857	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2858	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2859
2860	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2861	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2862
2863	for my $child ($self->children) {	3041	for my $child ($self->children) {
2864	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2865		3043
2866	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2867	if exists $child->{req_x};	3045	if exists $child->{req_x};
2868		3046
2869	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2870	if exists $child->{req_y};	3048	if exists $child->{req_y};
2871		3049
		3050	$X = $self->{user_x} if exists $self->{user_x};
		3051	$Y = $self->{user_y} if exists $self->{user_y};
		3052
2872	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2873	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2874		3055
2875	$child->configure ($X, $Y, $W, $H);	3056	$child->configure ($X, $Y, $W, $H);
2876	}	3057	}
…		…
2896	}	3077	}
2897		3078
2898	sub add {	3079	sub add {
2899	my ($self, @children) = @_;	3080	my ($self, @children) = @_;
2900		3081
		3082	for (my @widgets = @children; my $w = pop @widgets; ) {
		3083	push @widgets, $w->children;
		3084	$w->{root} = $self;
		3085	$w->{visible} = $self->{visible} + 1;
		3086	}
		3087
2901	for my $child (@children) {	3088	for my $child (@children) {
2902	$child->{toplevel} = 1;	3089	$child->{is_toplevel} = 1;
2903		3090
2904	# integerise window positions	3091	# integerise window positions
2905	$child->{x} = int $child->{x};	3092	$child->{x} = int $child->{x};
2906	$child->{y} = int $child->{y};	3093	$child->{y} = int $child->{y};
2907	}	3094	}
2908		3095
2909	$self->SUPER::add (@children);	3096	$self->SUPER::add (@children);
2910	}	3097	}
2911		3098
		3099	sub remove {
		3100	my ($self, @children) = @_;
		3101
		3102	$self->SUPER::remove (@children);
		3103
		3104	while (@children) {
		3105	my $w = pop @children;
		3106	push @children, $w->children;
		3107	$w->set_invisible;
		3108	}
		3109	}
		3110
2912	sub on_refresh {	3111	sub on_refresh {
2913	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
2914		3113
2915	$self->{refresh_hook}{$id} = $cb;	3114	$self->{refresh_hook}{$id} = $cb;
2916	}	3115	}
…		…
2928	$_->()	3127	$_->()
2929	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
2930	}	3129	}
2931		3130
2932	if ($self->{check_size}) {	3131	if ($self->{check_size}) {
2933	my @queue = ([], []);	3132	my @queue;
2934		3133
2935	for (;;) {	3134	for (;;) {
2936	if ($self->{check_size}) {	3135	if ($self->{check_size}) {
2937	# heuristic: check containers last	3136	#TODO use array-of-depth approach
2938	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
		3138	@queue = sort { $a->{visible} <=> $b->{visible} }
2939	for values %{delete $self->{check_size}}	3139	@queue, values %{delete $self->{check_size}};
2940	}	3140	}
2941		3141
2942	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
		3143
		3144	defined $widget->{visible} or last; # do not resize invisible widgets
2943		3145
2944	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2945	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(user_w user_h)}
2946	: $widget->size_request;	3148	: $widget->size_request;
2947		3149
…		…
2967	$w = 0 if $w < 0;	3169	$w = 0 if $w < 0;
2968	$h = 0 if $h < 0;	3170	$h = 0 if $h < 0;
2969		3171
2970	$widget->{w} = $w;	3172	$widget->{w} = $w;
2971	$widget->{h} = $h;	3173	$widget->{h} = $h;
2972	$widget->size_allocate ($w, $h);
2973	$widget->emit (size_allocate => $w, $h);	3174	$widget->emit (size_allocate => $w, $h);
2974	}	3175	}
2975	}	3176	}
2976		3177
2977	while ($self->{post_alloc_hook}) {	3178	while ($self->{post_alloc_hook}) {
…		…
2983	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984	glClear GL_COLOR_BUFFER_BIT;	3185	glClear GL_COLOR_BUFFER_BIT;
2985		3186
2986	glMatrixMode GL_PROJECTION;	3187	glMatrixMode GL_PROJECTION;
2987	glLoadIdentity;	3188	glLoadIdentity;
2988	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989	glMatrixMode GL_MODELVIEW;	3190	glMatrixMode GL_MODELVIEW;
2990	glLoadIdentity;	3191	glLoadIdentity;
2991		3192
2992	$self->_draw;	3193	$self->_draw;
2993	}	3194	}
…		…
2995	#############################################################################	3196	#############################################################################
2996		3197
2997	package CFClient::UI;	3198	package CFClient::UI;
2998		3199
2999	$ROOT = new CFClient::UI::Root;	3200	$ROOT = new CFClient::UI::Root;
3000	$TOOLTIP = new CFClient::UI::Tooltip;	3201	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001		3202
3002	1	3203	1
3003		3204

Diff Legend

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