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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

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

Diff Legend

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