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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 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}) {
23		43
24	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
25	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
26		48
27	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
28		50
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		52
31	$TOOLTIP->set_tooltip_from ($widget);	53	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	54	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	55	}
43		56
44	return;	57	return;
45	}	58	}
46	}	59	}
…		…
155	for my $widget (values %WIDGET) {	168	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	169	if ($widget->{is_toplevel}) {
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165	}	176	}
166	}	177	}
167		178
168	reconfigure_widgets;	179	reconfigure_widgets;
169	}	180	}
…		…
186	can_events => 1,	197	can_events => 1,
187	@_	198	@_
188	}, $class;	199	}, $class;
189		200
190	for (keys %$self) {	201	for (keys %$self) {
191	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
193	}	204	}
194	}	205	}
195		206
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
198	$self	216	$self
199	}	217	}
200		218
201	sub destroy {	219	sub destroy {
202	my ($self) = @_;	220	my ($self) = @_;
…		…
205	%$self = ();	223	%$self = ();
206	}	224	}
207		225
208	sub show {	226	sub show {
209	my ($self) = @_;	227	my ($self) = @_;
		228
210	return if $self->{parent};	229	return if $self->{parent};
211		230
212	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
213	}	232	}
214		233
215	sub show_centered {	234	sub center {
216	my ($self) = @_;	235	my ($self) = @_;
217	return if $self->{parent};
218
219	$self->show;
220		236
221	$CFClient::UI::ROOT->on_post_alloc (	237	$CFClient::UI::ROOT->on_post_alloc (
222	"centered $self" => sub {	238	"center_$self" => sub {
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224	},	240	},
225	);	241	);
		242
		243	$self->update;
		244	}
		245
		246	sub set_visible {
		247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
226	}	259	}
227		260
228	sub set_invisible {	261	sub set_invisible {
229	my ($self) = @_;	262	my ($self) = @_;
230		263
231	# broken show/hide model	264	return unless $self->{visible};
232		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
233	delete $self->{visible};	269	delete $self->{visible};
234		270
235	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	272	undef $HOVER if $HOVER == $self;
237		273
238	CFClient::UI::check_tooltip	274	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	275	if $TOOLTIP->{owner} == $self;
240		276
241	$self->focus_out;	277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
242	}	297	}
243		298
244	sub hide {	299	sub hide {
245	my ($self) = @_;	300	my ($self) = @_;
246		301
…		…
261	}	316	}
262		317
263	sub set_size {	318	sub set_size {
264	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
265		320
266	$self->{user_w} = $w;	321	$self->{def_w} = $w;
267	$self->{user_h} = $h;	322	$self->{def_h} = $h;
268		323
269	$self->check_size;	324	$self->realloc;
270	}	325	}
271		326
272	sub size_request {	327	sub size_request {
273	require Carp;	328	require Carp;
274	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
294	$self->{y} = $y;	349	$self->{y} = $y;
295	$self->update;	350	$self->update;
296	}	351	}
297		352
298	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300	}	357	}
301	}	358	}
302		359
303	sub size_allocate {	360	sub size_allocate {
304	# nothing to be done	361	# nothing to be done
305	}	362	}
306		363
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	364	sub children {
315	}	365	}
316		366
317	sub set_max_size {	367	sub set_max_size {
318	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
…		…
321	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
322	}	372	}
323		373
324	sub set_tooltip {	374	sub set_tooltip {
325	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
326		381
327	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
328		383
329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
…		…
389	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
394		512
395	sub draw {	513	sub draw {
396	my ($self) = @_;	514	my ($self) = @_;
397		515
398	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
420	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
421	glPushMatrix;	539	glPushMatrix;
422	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
423	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
425	glVertex 0 , 0;	543	glVertex 0 , 0;
426	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
427	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
428	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
429	glEnd;	547	glEnd;
430	glPopMatrix;	548	glPopMatrix;
431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432	}	550	}
433	}	551	}
434		552
435	sub _draw {	553	sub _draw {
436	my ($self) = @_;	554	my ($self) = @_;
437		555
438	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
439	}
440
441	sub find_widget {
442	my ($self, $x, $y) = @_;
443
444	return () unless $self->{can_events};
445
446	return $self
447	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450	()
451	}
452
453	sub set_parent {
454	my ($self, $parent) = @_;
455
456	Scalar::Util::weaken ($self->{parent} = $parent);
457
458	# TODO: req_w _does_change after ->reconfigure
459	$self->check_size
460	unless exists $self->{req_w};
461
462	$self->show;
463	}
464
465	sub check_size {
466	my ($self, $forced) = @_;
467
468	$self->{force_alloc} = 1 if $forced;
469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
470	}
471
472	sub update {
473	my ($self) = @_;
474
475	$self->{parent}->update
476	if $self->{parent};
477	}
478
479	sub connect {
480	my ($self, $signal, $cb) = @_;
481
482	push @{ $self->{signal_cb}{$signal} }, $cb;
483	}
484
485	sub _emit {
486	my ($self, $signal, @args) = @_;
487
488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489	}
490
491	sub emit {
492	my ($self, $signal, @args) = @_;
493
494	$self->_emit ($signal, @args)
495	|| $self->$signal (@args);
496	}	557	}
497		558
498	sub DESTROY {	559	sub DESTROY {
499	my ($self) = @_;	560	my ($self) = @_;
500		561
…		…
597	$self->{children} = [	658	$self->{children} = [
598	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
599	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
600	];	661	];
601		662
602	$self->check_size (1);	663	$self->realloc;
603	$self->update;
604	}	664	}
605		665
606	sub children {	666	sub children {
607	@{ $_[0]{children} }	667	@{ $_[0]{children} }
608	}	668	}
…		…
613	delete $child->{parent};	673	delete $child->{parent};
614	$child->hide;	674	$child->hide;
615		675
616	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617		677
618	$self->check_size;	678	$self->realloc;
619	$self->update;
620	}	679	}
621		680
622	sub clear {	681	sub clear {
623	my ($self) = @_;	682	my ($self) = @_;
624		683
…		…
628	for (@$children) {	687	for (@$children) {
629	delete $_->{parent};	688	delete $_->{parent};
630	$_->hide;	689	$_->hide;
631	}	690	}
632		691
633	$self->check_size;	692	$self->realloc;
634	$self->update;
635	}	693	}
636		694
637	sub find_widget {	695	sub find_widget {
638	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
639		697
…		…
692	sub size_request {	750	sub size_request {
693	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
694	}	752	}
695		753
696	sub size_allocate {	754	sub size_allocate {
697	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
698		756
699	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
700	}	758	}
701		759
702	#############################################################################	760	#############################################################################
…		…
719	$ROOT->on_post_alloc ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
720	$self->SUPER::update;	778	$self->SUPER::update;
721	}	779	}
722		780
723	sub size_allocate {	781	sub size_allocate {
724	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
725		783
726	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
727	$self->update;	785	$self->update
		786	if $changed;
728	}	787	}
729		788
730	sub _render {	789	sub _render {
731	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
732	}	791	}
…		…
763		822
764	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
765		824
766	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
767		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
768	sub size_request {	837	sub size_request {
769	my ($self) = @_;	838	my ($self) = @_;
770		839
771	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772		841
773	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
774	}	846	}
775		847
776	sub size_allocate {	848	sub size_allocate {
777	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
778		850
779	my ($cw, $ch) = @$self{qw(child_w child_h)};	851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780	# $w = $self->{w};	852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
781	$self->child->configure (0, 0, $cw, $ch);	854	$self->child->configure (0, 0, $w, $h);
782	$self->update;	855	$self->update;
783	}	856	}
784		857
785	sub set_offset {	858	sub set_offset {
786	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
837	my $class = shift;	910	my $class = shift;
838		911
839	my $self;	912	my $self;
840		913
841	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
842	vertical => 1,	915	vertical => 1,
843	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
844	connect_changed => sub {	917	on_changed => sub {
845	$self->{vp}->set_offset (0, $_[1]);	918	$self->{vp}->set_offset (0, $_[1]);
846	},	919	},
847	;	920	;
848		921
849	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
…		…
857	$self->add ($self->{slider});	930	$self->add ($self->{slider});
858		931
859	$self	932	$self
860	}	933	}
861		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
862	sub size_allocate {	945	sub size_allocate {
863	my ($self, $w, $h) = @_;	946	my ($self, $w, $h, $changed) = @_;
864		947
865	$self->SUPER::size_allocate ($w, $h);	948	$self->SUPER::size_allocate ($w, $h, $changed);
866		949
867	my $child = $self->{vp}->child;	950	my $child = $self->{vp}->child;
868	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869	}	952	}
870		953
…		…
917		1000
918	our @ISA = CFClient::UI::Bin::;	1001	our @ISA = CFClient::UI::Bin::;
919		1002
920	use CFClient::OpenGL;	1003	use CFClient::OpenGL;
921		1004
922	my @tex =	1005	my $bg =
		1006	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1007	mipmap => 1, wrap => 1;
		1008
		1009	my @border =
923	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1011	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925		1012
926	sub new {	1013	sub new {
927	my $class = shift;	1014	my $class = shift;
928
929	# TODO: user_x, user_y, overwrite moveto?
930		1015
931	my $self = $class->SUPER::new (	1016	my $self = $class->SUPER::new (
932	bg => [1, 1, 1, 1],	1017	bg => [1, 1, 1, 1],
933	border_bg => [1, 1, 1, 1],	1018	border_bg => [1, 1, 1, 1],
934	border => 0.6,	1019	border => 0.6,
…		…
960	$h + $self->border * 2,	1045	$h + $self->border * 2,
961	)	1046	)
962	}	1047	}
963		1048
964	sub size_allocate {	1049	sub size_allocate {
965	my ($self, $w, $h) = @_;	1050	my ($self, $w, $h, $changed) = @_;
		1051
		1052	return unless $changed;
966		1053
967	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
968	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
969		1056
970	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
994	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
995		1082
996	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
997	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
998		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
999	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1000	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1001	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
1002	$self->check_size;	1091	$self->realloc;
1003	};	1092	};
1004		1093
1005	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
1006	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007	my ($bx, $by) = ($self->{x}, $self->{y});	1096	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1009	$self->{motion} = sub {	1098	$self->{motion} = sub {
1010	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
1011		1100
1012	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
1013		1102
1014	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
1015	$self->update;	1107	$self->realloc;
1016	};	1108	};
1017	}	1109	}
1018	}	1110	}
1019		1111
1020	sub button_up {	1112	sub button_up {
…		…
1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040		1132
1041	my $border = $self->border;	1133	my $border = $self->border;
1042		1134
1043	glColor @{ $self->{border_bg} };	1135	glColor @{ $self->{border_bg} };
1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1136	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1137	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1138	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1139	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048		1140
1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050	my $bg = $tex[0];	1142	glColor @{ $self->{bg} };
1051		1143
1052	# TODO: repeat texture not scale	1144	# TODO: repeat texture not scale
		1145	# solve this better(?)
1053	my $rep_x = $cw / $bg->{w};	1146	$bg->{s} = $cw / $bg->{w};
1054	my $rep_y = $ch / $bg->{h};	1147	$bg->{t} = $ch / $bg->{h};
1055
1056	glColor @{ $self->{bg} };
1057
1058	$bg->{s} = $rep_x;
1059	$bg->{t} = $rep_y;
1060	$bg->{wrap_mode} = 1;
1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1148	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062	}	1149	}
1063		1150
1064	glDisable GL_TEXTURE_2D;	1151	glDisable GL_TEXTURE_2D;
1065		1152
…		…
1081	sub new {	1168	sub new {
1082	my $class = shift;	1169	my $class = shift;
1083		1170
1084	$class->SUPER::new (	1171	$class->SUPER::new (
1085	col_expand => [],	1172	col_expand => [],
1086	@_	1173	@_,
1087	)	1174	)
		1175	}
		1176
		1177	sub children {
		1178	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088	}	1179	}
1089		1180
1090	sub add {	1181	sub add {
1091	my ($self, $x, $y, $child) = @_;	1182	my ($self, $x, $y, $child) = @_;
1092		1183
1093	$child->set_parent ($self);	1184	$child->set_parent ($self);
1094	$self->{children}[$y][$x] = $child;	1185	$self->{children}[$y][$x] = $child;
1095		1186
1096	$child->check_size;	1187	$self->realloc;
1097	}	1188	}
1098		1189
1099	sub children {
1100	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101	}
1102
1103	# TODO: move to container class maybe? send childs a signal on removal?	1190	# TODO: move to container class maybe? send children a signal on removal?
1104	sub clear {	1191	sub clear {
1105	my ($self) = @_;	1192	my ($self) = @_;
1106		1193
1107	my @children = $self->children;	1194	my @children = $self->children;
1108	delete $self->{children};	1195	delete $self->{children};
…		…
1110	for (@children) {	1197	for (@children) {
1111	delete $_->{parent};	1198	delete $_->{parent};
1112	$_->hide;	1199	$_->hide;
1113	}	1200	}
1114		1201
1115	$self->update;	1202	$self->realloc;
1116	}	1203	}
1117		1204
1118	sub get_wh {	1205	sub get_wh {
1119	my ($self) = @_;	1206	my ($self) = @_;
1120		1207
…		…
1147	(sum @$hs),	1234	(sum @$hs),
1148	)	1235	)
1149	}	1236	}
1150		1237
1151	sub size_allocate {	1238	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1239	my ($self, $w, $h, $changed) = @_;
1153		1240
1154	my ($ws, $hs) = $self->get_wh;	1241	my ($ws, $hs) = $self->get_wh;
1155		1242
1156	my $req_w = sum @$ws;	1243	my $req_w = (sum @$ws) || 1;
1157	my $req_h = sum @$hs;	1244	my $req_h = (sum @$hs) || 1;
1158		1245
1159	# TODO: nicer code && do row_expand	1246	# TODO: nicer code && do row_expand
1160	my @col_expand = @{$self->{col_expand}};	1247	my @col_expand = @{$self->{col_expand}};
1161	@col_expand = (1) x @$ws unless @col_expand;	1248	@col_expand = (1) x @$ws unless @col_expand;
1162	my $col_expand = (sum @col_expand) || 1;	1249	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1303	}
1217	}	1304	}
1218		1305
1219	#############################################################################	1306	#############################################################################
1220		1307
		1308	package CFClient::UI::Box;
		1309
		1310	our @ISA = CFClient::UI::Container::;
		1311
		1312	sub size_request {
		1313	my ($self) = @_;
		1314
		1315	$self->{vertical}
		1316	? (
		1317	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1318	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1319	)
		1320	: (
		1321	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1322	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1323	)
		1324	}
		1325
		1326	sub size_allocate {
		1327	my ($self, $w, $h, $changed) = @_;
		1328
		1329	my $space = $self->{vertical} ? $h : $w;
		1330	my $children = $self->{children};
		1331
		1332	my @req;
		1333
		1334	if ($self->{homogeneous}) {
		1335	@req = ($space / (@$children || 1)) x @$children;
		1336	} else {
		1337	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1338	my $req = List::Util::sum @req;
		1339
		1340	if ($req > $space) {
		1341	# ah well, not enough space
		1342	$_ *= $space / $req for @req;
		1343	} else {
		1344	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1345
		1346	$space = ($space - $req) / $expand; # remaining space to give away
		1347
		1348	$req[$_] += $space * $children->[$_]{expand}
		1349	for 0 .. $#$children;
		1350	}
		1351	}
		1352
		1353	CFClient::UI::harmonize \@req;
		1354
		1355	my $pos = 0;
		1356	for (0 .. $#$children) {
		1357	my $alloc = $req[$_];
		1358	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1359
		1360	$pos += $alloc;
		1361	}
		1362
		1363	1
		1364	}
		1365
		1366	#############################################################################
		1367
1221	package CFClient::UI::HBox;	1368	package CFClient::UI::HBox;
1222		1369
1223	# TODO: wrap into common Box base class
1224
1225	our @ISA = CFClient::UI::Container::;	1370	our @ISA = CFClient::UI::Box::;
1226		1371
1227	sub size_request {	1372	sub new {
1228	my ($self) = @_;	1373	my $class = shift;
1229		1374
1230	my @alloc = map [$_->size_request], @{$self->{children}};	1375	$class->SUPER::new (
1231		1376	vertical => 0,
1232	(	1377	@_,
1233	(List::Util::sum map $_->[0], @alloc),
1234	(List::Util::max map $_->[1], @alloc),
1235	)	1378	)
1236	}	1379	}
1237		1380
1238	sub size_allocate {
1239	my ($self, $w, $h) = @_;
1240
1241	($h, $w) = ($w, $h);
1242
1243	my $children = $self->{children};
1244
1245	my @h = map $_->{req_w}, @$children;
1246
1247	my $req_h = List::Util::sum @h;
1248
1249	if ($req_h > $h) {
1250	# ah well, not enough space
1251	$_ *= $h / $req_h for @h;
1252	} else {
1253	my $exp = List::Util::sum map $_->{expand}, @$children;
1254	$exp ||= 1;
1255
1256	for (0 .. $#$children) {
1257	my $child = $children->[$_];
1258
1259	my $alloc_h = $h[$_];
1260	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261	$h[$_] = $alloc_h;
1262	}
1263	}
1264
1265	CFClient::UI::harmonize \@h;
1266
1267	my $y = 0;
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270	my $h = $h[$_];
1271	$child->configure ($y, 0, $h, $w);
1272
1273	$y += $h;
1274	}
1275
1276	1
1277	}
1278
1279	#############################################################################	1381	#############################################################################
1280		1382
1281	package CFClient::UI::VBox;	1383	package CFClient::UI::VBox;
1282		1384
1283	# TODO: wrap into common Box base class
1284
1285	our @ISA = CFClient::UI::Container::;	1385	our @ISA = CFClient::UI::Box::;
1286		1386
1287	sub size_request {	1387	sub new {
1288	my ($self) = @_;	1388	my $class = shift;
1289		1389
1290	my @alloc = map [$_->size_request], @{$self->{children}};	1390	$class->SUPER::new (
1291		1391	vertical => 1,
1292	(	1392	@_,
1293	(List::Util::max map $_->[0], @alloc),
1294	(List::Util::sum map $_->[1], @alloc),
1295	)	1393	)
1296	}
1297
1298	sub size_allocate {
1299	my ($self, $w, $h) = @_;
1300
1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303	my $children = $self->{children};
1304
1305	my @h = map $_->{req_h}, @$children;
1306
1307	my $req_h = List::Util::sum @h;
1308
1309	if ($req_h > $h) {
1310	# ah well, not enough space
1311	$_ *= $h / $req_h for @h;
1312	} else {
1313	my $exp = List::Util::sum map $_->{expand}, @$children;
1314	$exp ||= 1;
1315
1316	for (0 .. $#$children) {
1317	my $child = $children->[$_];
1318
1319	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320	}
1321	}
1322
1323	CFClient::UI::harmonize \@h;
1324
1325	my $y = 0;
1326	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];
1329	$child->configure (0, $y, $w, $h);
1330
1331	$y += $h;
1332	}
1333
1334	1
1335	}	1394	}
1336		1395
1337	#############################################################################	1396	#############################################################################
1338		1397
1339	package CFClient::UI::Label;	1398	package CFClient::UI::Label;
…		…
1402	$self->{text} = "T$text";	1461	$self->{text} = "T$text";
1403		1462
1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1463	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405	$self->{layout}->set_text ($text);	1464	$self->{layout}->set_text ($text);
1406		1465
		1466	$self->realloc;
1407	$self->update;	1467	$self->update;
1408	$self->check_size;
1409	}	1468	}
1410		1469
1411	sub set_markup {	1470	sub set_markup {
1412	my ($self, $markup) = @_;	1471	my ($self, $markup) = @_;
1413		1472
…		…
1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1476	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418		1477
1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1478	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420	$self->{layout}->set_markup ($markup);	1479	$self->{layout}->set_markup ($markup);
1421		1480
		1481	$self->realloc;
1422	$self->update;	1482	$self->update;
1423	$self->check_size;
1424	}	1483	}
1425		1484
1426	sub size_request {	1485	sub size_request {
1427	my ($self) = @_;	1486	my ($self) = @_;
1428		1487
…		…
1449	$h + $self->{padding} * 2,	1508	$h + $self->{padding} * 2,
1450	)	1509	)
1451	}	1510	}
1452		1511
1453	sub size_allocate {	1512	sub size_allocate {
1454	my ($self, $w, $h) = @_;	1513	my ($self, $w, $h, $changed) = @_;
1455		1514
1456	delete $self->{texture};	1515	delete $self->{texture}
		1516	if $changed;
1457	}	1517	}
1458		1518
1459	sub set_fontsize {	1519	sub set_fontsize {
1460	my ($self, $fontsize) = @_;	1520	my ($self, $fontsize) = @_;
1461		1521
1462	$self->{fontsize} = $fontsize;	1522	$self->{fontsize} = $fontsize;
1463	delete $self->{texture};	1523	delete $self->{texture};
1464		1524
1465	$self->update;	1525	$self->realloc;
1466	$self->check_size;
1467	}	1526	}
1468		1527
1469	sub _draw {	1528	sub _draw {
1470	my ($self) = @_;	1529	my ($self) = @_;
1471		1530
…		…
1551	sub set_text {	1610	sub set_text {
1552	my ($self, $text) = @_;	1611	my ($self, $text) = @_;
1553		1612
1554	$self->{cursor} = length $text;	1613	$self->{cursor} = length $text;
1555	$self->_set_text ($text);	1614	$self->_set_text ($text);
1556	$self->update;	1615
1557	$self->check_size;	1616	$self->realloc;
1558	}	1617	}
1559		1618
1560	sub get_text {	1619	sub get_text {
1561	$_[0]{text}	1620	$_[0]{text}
1562	}	1621	}
…		…
1595	} elsif ($uni) {	1654	} elsif ($uni) {
1596	substr $text, $self->{cursor}++, 0, chr $uni;	1655	substr $text, $self->{cursor}++, 0, chr $uni;
1597	}	1656	}
1598		1657
1599	$self->_set_text ($text);	1658	$self->_set_text ($text);
1600	$self->update;	1659
1601	$self->check_size;	1660	$self->realloc;
1602	}	1661	}
1603		1662
1604	sub focus_in {	1663	sub focus_in {
1605	my ($self) = @_;	1664	my ($self) = @_;
1606		1665
…		…
2113	$self->update;	2172	$self->update;
2114		2173
2115	$self	2174	$self
2116	}	2175	}
2117		2176
		2177	sub changed { }
		2178
2118	sub set_range {	2179	sub set_range {
2119	my ($self, $range) = @_;	2180	my ($self, $range) = @_;
2120		2181
2121	$self->{range} = $range;	2182	($range, $self->{range}) = ($self->{range}, $range);
2122		2183
2123	$self->update;	2184	$self->update
		2185	if "@$range" ne "@{$self->{range}}";
2124	}	2186	}
2125		2187
2126	sub set_value {	2188	sub set_value {
2127	my ($self, $value) = @_;	2189	my ($self, $value) = @_;
2128		2190
…		…
2310	$self->{fontsize} = $fontsize;	2372	$self->{fontsize} = $fontsize;
2311	$self->reflow;	2373	$self->reflow;
2312	}	2374	}
2313		2375
2314	sub size_allocate {	2376	sub size_allocate {
2315	my ($self, $w, $h) = @_;	2377	my ($self, $w, $h, $changed) = @_;
2316		2378
2317	$self->SUPER::size_allocate ($w, $h);	2379	$self->SUPER::size_allocate ($w, $h, $changed);
		2380
		2381	return unless $changed;
2318		2382
2319	$self->{layout}->set_font ($self->{font}) if $self->{font};	2383	$self->{layout}->set_font ($self->{font}) if $self->{font};
2320	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321	$self->{layout}->set_width ($self->{children}[0]{w});	2385	$self->{layout}->set_width ($self->{children}[0]{w});
2322		2386
…		…
2511		2575
2512	sub new {	2576	sub new {
2513	my $class = shift;	2577	my $class = shift;
2514		2578
2515	my $self = $class->SUPER::new (	2579	my $self = $class->SUPER::new (
2516	state => 0,	2580	state => 0,
2517	connect_activate => \&toggle_flopper,	2581	on_activate => \&toggle_flopper,
2518	@_	2582	@_
2519	);	2583	);
2520		2584
2521	if ($self->{state}) {
2522	$self->{state} = 0;
2523	$self->toggle_flopper;
2524	}
2525
2526	$self	2585	$self
2527	}	2586	}
2528		2587
2529	sub toggle_flopper {	2588	sub toggle_flopper {
2530	my ($self) = @_;	2589	my ($self) = @_;
2531		2590
2532	# TODO: use animation	2591	$self->{other}->toggle_visibility;
2533	if ($self->{state} = !$self->{state}) {
2534	$CFClient::UI::ROOT->add ($self->{other});
2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2536	$self->_emit ("open");
2537	} else {
2538	$CFClient::UI::ROOT->remove ($self->{other});
2539	$self->_emit ("close");
2540	}
2541
2542	$self->_emit (changed => $self->{state});
2543	}	2592	}
2544		2593
2545	#############################################################################	2594	#############################################################################
2546		2595
2547	package CFClient::UI::Tooltip;	2596	package CFClient::UI::Tooltip;
…		…
2579		2628
2580	($w + 4, $h + 4)	2629	($w + 4, $h + 4)
2581	}	2630	}
2582		2631
2583	sub size_allocate {	2632	sub size_allocate {
2584	my ($self, $w, $h) = @_;	2633	my ($self, $w, $h, $changed) = @_;
2585		2634
		2635	return unless $changed;
		2636
2586	$self->SUPER::size_allocate ($w - 4, $h - 4);	2637	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2638	}
		2639
		2640	sub visibility_change {
		2641	my ($self, $visible) = @_;
		2642
		2643	return unless $visible;
		2644
		2645	$self->{root}->on_post_alloc ("move_$self" => sub {
		2646	my $widget = $self->{owner}
		2647	or return;
		2648
		2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2650
		2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2652	if $x + $self->{w} > $::WIDTH;
		2653
		2654	$self->move ($x, $y);
		2655	});
2587	}	2656	}
2588		2657
2589	sub _draw {	2658	sub _draw {
2590	my ($self) = @_;	2659	my ($self) = @_;
2591		2660
…		…
2608	glVertex $w, $h;	2677	glVertex $w, $h;
2609	glVertex $w, 0;	2678	glVertex $w, 0;
2610	glEnd;	2679	glEnd;
2611		2680
2612	glTranslate 2 - 0.375, 2 - 0.375;	2681	glTranslate 2 - 0.375, 2 - 0.375;
		2682
2613	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2614	}	2684	}
2615		2685
2616	#############################################################################	2686	#############################################################################
2617		2687
…		…
2623		2693
2624	sub new {	2694	sub new {
2625	my $class = shift;	2695	my $class = shift;
2626		2696
2627	my $self = $class->SUPER::new (	2697	my $self = $class->SUPER::new (
2628	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2629	@_,	2700	@_,
2630	);	2701	);
2631		2702
2632	if ($self->{anim} && $self->{animspeed}) {	2703	if ($self->{anim} && $self->{animspeed}) {
2633	Scalar::Util::weaken (my $widget = $self);	2704	Scalar::Util::weaken (my $widget = $self);
…		…
2692	$self->SUPER::DESTROY;	2763	$self->SUPER::DESTROY;
2693	}	2764	}
2694		2765
2695	#############################################################################	2766	#############################################################################
2696		2767
2697	package CFClient::UI::InventoryItem;	2768	package CFClient::UI::Inventory;
2698		2769
2699	our @ISA = CFClient::UI::HBox::;	2770	our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701	sub _item_to_desc {
2702	my ($item) = @_;
2703
2704	my $desc =
2705	$item->{nrof} < 2
2706	? $item->{name}
2707	: "$item->{nrof} × $item->{name_pl}";
2708
2709	$item->{flags} & Crossfire::Protocol::F_OPEN
2710	and $desc .= " (open)";
2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
2712	and $desc .= " (applied)";
2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
2714	and $desc .= " (unpaid)";
2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
2716	and $desc .= " (magic)";
2717	$item->{flags} & Crossfire::Protocol::F_CURSED
2718	and $desc .= " (cursed)";
2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
2720	and $desc .= " (damned)";
2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
2722	and $desc .= " *";
2723
2724	$desc
2725	}
2726		2771
2727	sub new {	2772	sub new {
2728	my $class = shift;	2773	my $class = shift;
2729		2774
2730	my %args = @_;
2731
2732	my $item = delete $args{item};
2733
2734	my $desc = _item_to_desc ($item);
2735
2736	my $self = $class->SUPER::new (	2775	my $self = $class->SUPER::new (
2737	can_hover => 1,
2738	can_events => 1,
2739	tooltip => ((CFClient::UI::Label::escape $desc)
2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741	connect_button_down => sub {
2742	my ($self, $ev, $x, $y) = @_;
2743
2744	# todo: maybe put examine on 1? but should just be a tooltip :(
2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746	my $targ = $::CONN->{player}{tag};
2747
2748	if ($item->{container} == $::CONN->{player}{tag}) {
2749	$targ = $main::OPENCONT;
2750	}
2751
2752	$::CONN->send ("move $targ $item->{tag} 0");
2753	} elsif ($ev->{button} == 1) {
2754	$::CONN->send ("examine $item->{tag}");
2755	} elsif ($ev->{button} == 2) {
2756	$::CONN->send ("apply $item->{tag}");
2757	} elsif ($ev->{button} == 3) {
2758	my @menu_items = (
2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762	(
2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
2764	? (
2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766	)
2767	: (
2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770	)
2771	),
2772	);
2773
2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775	}
2776
2777	1
2778	},
2779	%args
2780	);
2781
2782
2783	$self->add (new CFClient::UI::Face
2784	can_events => 0,
2785	face => $item->{face},
2786	anim => $item->{anim},
2787	animspeed => $item->{animspeed},
2788	);
2789
2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792	$self->{item} = $item;
2793
2794	$self->update_item;
2795
2796	$self
2797	}
2798
2799	sub update_item {
2800	my ($self) = @_;
2801
2802	my $desc = _item_to_desc ($self->{item});
2803
2804	$self->{name_lbl}->set_text ($desc);
2805	}
2806
2807	#############################################################################
2808
2809	package CFClient::UI::Inventory;
2810
2811	our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813	sub new {
2814	my $class = shift;
2815
2816	my $self = $class->SUPER::new (
2817	scrolled => (new CFClient::UI::Table),	2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818	@_,	2777	@_,
2819	);	2778	);
2820		2779
2821	$self	2780	$self
2822	}	2781	}
…		…
2832	or ($a->{name} cmp $b->{name})	2791	or ($a->{name} cmp $b->{name})
2833	} @$items;	2792	} @$items;
2834		2793
2835	$self->{real_items} = \@items;	2794	$self->{real_items} = \@items;
2836		2795
		2796	my $row = 0;
2837	for my $item (@items) {	2797	for my $item (@items) {
2838	$item->{item} = $item;	2798	CFClient::Item::update_widgets $item;
2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840	$item->update_item ();
2841	}
2842		2799
2843	my $i = 0;	2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2844	for (@items) {	2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2845	$self->{scrolled}->add (0, $i, $_);	2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2846	my $nrof = $_->{item}->{nrof} || 1;
2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848	}
2849		2803
2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2804	$row++;
2851	}	2805	}
2852
2853	sub size_request {
2854	my ($self) = @_;
2855	($self->{req_w}, $self->{req_h});
2856	}	2806	}
2857		2807
2858	#############################################################################	2808	#############################################################################
2859		2809
2860	package CFClient::UI::Menu;	2810	package CFClient::UI::Menu;
…		…
2992	sub add {	2942	sub add {
2993	my ($self, $text, %arg) = @_;	2943	my ($self, $text, %arg) = @_;
2994		2944
2995	$text =~ s/^\s+//;	2945	$text =~ s/^\s+//;
2996	$text =~ s/\s+$//;	2946	$text =~ s/\s+$//;
		2947
		2948	return unless $text;
2997		2949
2998	my $timeout = time + ((delete $arg{timeout}) || 60);	2950	my $timeout = time + ((delete $arg{timeout}) || 60);
2999		2951
3000	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001		2953
…		…
3044	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
3045		2997
3046	sub new {	2998	sub new {
3047	my $class = shift;	2999	my $class = shift;
3048		3000
3049	$class->SUPER::new (	3001	my $self = $class->SUPER::new (
		3002	visible => 1,
3050	@_,	3003	@_,
3051	)	3004	);
		3005
		3006	Scalar::Util::weaken ($self->{root} = $self);
		3007
		3008	$self
3052	}	3009	}
3053		3010
3054	sub configure {	3011	sub configure {
3055	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
3056		3013
3057	$self->{w} = $w;	3014	$self->{w} = $w;
3058	$self->{h} = $h;	3015	$self->{h} = $h;
3059	}	3016	}
3060		3017
3061	sub check_size {	3018	sub reconfigure {
3062	my ($self) = @_;	3019	my ($self) = @_;
3063		3020
		3021	$self->SUPER::reconfigure;
		3022
3064	$self->size_allocate ($self->{w}, $self->{h})	3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
3065	if $self->{w};	3024	if $self->{w};
3066	}	3025	}
3067		3026
3068	sub size_request {	3027	sub size_request {
3069	my ($self) = @_;	3028	my ($self) = @_;
3070		3029
3071	($self->{w}, $self->{h})	3030	($self->{w}, $self->{h})
3072	}	3031	}
3073		3032
3074	sub size_allocate {	3033	sub size_allocate {
3075	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h, $changed) = @_;
3076		3035
3077	for my $child ($self->children) {	3036	for my $child ($self->children) {
3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079		3038
3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081	if exists $child->{req_x};	3040	if exists $child->{req_x};
3082		3041
3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084	if exists $child->{req_y};	3043	if exists $child->{req_y};
3085		3044
		3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3046
3086	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088		3049
3089	$child->configure ($X, $Y, $W, $H);	3050	$child->configure ($X, $Y, $W, $H);
3090	}	3051	}
…		…
3103	}	3064	}
3104		3065
3105	sub update {	3066	sub update {
3106	my ($self) = @_;	3067	my ($self) = @_;
3107		3068
3108	$self->check_size;
3109	$::WANT_REFRESH++;	3069	$::WANT_REFRESH++;
3110	}	3070	}
3111		3071
3112	sub add {	3072	sub add {
3113	my ($self, @children) = @_;	3073	my ($self, @children) = @_;
3114
3115	for (my @widgets = @children; my $w = pop @widgets; ) {
3116	push @widgets, $w->children;
3117	$w->{root} = $self;
3118	$w->{visible} = 1;
3119	}
3120		3074
3121	for my $child (@children) {	3075	for my $child (@children) {
3122	$child->{is_toplevel} = 1;	3076	$child->{is_toplevel} = 1;
3123		3077
3124	# integerise window positions	3078	# integerise window positions
…		…
3159	while ($self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
3160	$_->()	3114	$_->()
3161	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{refresh_hook}};
3162	}	3116	}
3163		3117
3164	if ($self->{check_size}) {	3118	if ($self->{realloc}) {
3165	my @queue = ([], []);	3119	my @queue;
3166		3120
3167	for (;;) {	3121	while () {
3168	if ($self->{check_size}) {	3122	if ($self->{realloc}) {
3169	# heuristic: check containers last	3123	#TODO use array-of-depth approach
3170	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3124
3171	for values %{delete $self->{check_size}}	3125	@queue = sort { $a->{visible} <=> $b->{visible} }
		3126	@queue, values %{delete $self->{realloc}};
3172	}	3127	}
3173		3128
3174	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3129	my $widget = pop @queue || last;
3175		3130
		3131	$widget->{visible} or last; # do not resize invisible widgets
		3132
3176	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3177	? @$widget{qw(user_w user_h)}	3134	? @$widget{qw(def_w def_h)}
3178	: $widget->size_request;	3135	: $widget->size_request;
3179		3136
3180	if (delete $widget->{force_alloc}
3181	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183		3138
3184	$widget->{req_w} = $w;	3139	$widget->{req_w} = $w;
3185	$widget->{req_h} = $h;	3140	$widget->{req_h} = $h;
3186		3141
3187	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188		3143
3189	$widget->{parent}->check_size	3144	push @queue, $widget->{parent}
3190	if $widget->{parent};	3145	if $widget->{parent};
3191	}
3192	}	3146	}
3193	}	3147	}
3194		3148
3195	while ($self->{size_alloc}) {	3149	while (my $size_alloc = delete $self->{size_alloc}) {
3196	for (values %{delete $self->{size_alloc}}) {	3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3197	my ($widget, $w, $h) = @$_;	3151	values %$size_alloc;
		3152
		3153	while () {
		3154	my ($widget, $w, $h) = @{ pop @queue or last };
3198		3155
3199	$w = 0 if $w < 0;	3156	$w = 0 if $w < 0;
3200	$h = 0 if $h < 0;	3157	$h = 0 if $h < 0;
3201		3158
		3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3160
3202	$widget->{w} = $w;	3161	$widget->{w} = $w;
3203	$widget->{h} = $h;	3162	$widget->{h} = $h;
		3163
3204	$widget->emit (size_allocate => $w, $h);	3164	$widget->emit (size_allocate => $w, $h, $changed);
3205	}	3165	}
3206	}	3166	}
3207		3167
3208	while ($self->{post_alloc_hook}) {	3168	while ($self->{post_alloc_hook}) {
3209	$_->()	3169	$_->()

Diff Legend

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