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.217 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158	}	183	}
159
160	$widget->reconfigure;
161	}	184	}
		185
		186	reconfigure_widgets;
162	}	187	}
163		188
164	#############################################################################	189	#############################################################################
165		190
166	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
179	can_events => 1,	204	can_events => 1,
180	@_	205	@_
181	}, $class;	206	}, $class;
182		207
183	for (keys %$self) {	208	for (keys %$self) {
184	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
186	}	211	}
187	}	212	}
188		213
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
191	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
192	}	234	}
193		235
194	sub destroy {	236	sub destroy {
195	my ($self) = @_;	237	my ($self) = @_;
196		238
…		…
198	%$self = ();	240	%$self = ();
199	}	241	}
200		242
201	sub show {	243	sub show {
202	my ($self) = @_;	244	my ($self) = @_;
203
204	return if $self->{parent};	245	return if $self->{parent};
205		246
206	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
207	}	248	}
208		249
209	sub hide {	250	sub show_centered {
210	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
211		283
212	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
214		299
215	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
216	if $self->{parent};	301	if $self->{parent};
217	}	302	}
218		303
…		…
227	}	312	}
228		313
229	sub set_size {	314	sub set_size {
230	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
231		316
232	$self->{user_w} = $w;	317	$self->{def_w} = $w;
233	$self->{user_h} = $h;	318	$self->{def_h} = $h;
234		319
235	$self->check_size;	320	$self->check_size;
236	}	321	}
237		322
238	sub size_request {	323	sub size_request {
…		…
288	}	373	}
289		374
290	sub set_tooltip {	375	sub set_tooltip {
291	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
292		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
293	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
294		384
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
297	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
318	return if $FOCUS == $self;	408	return if $FOCUS == $self;
319	return unless $self->{can_focus};	409	return unless $self->{can_focus};
320		410
321	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
322		412
323	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
324		414
325	$focus->update if $focus;	415	$focus->update if $focus;
326	$FOCUS->update;	416	$FOCUS->update;
327	}	417	}
328		418
…		…
331		421
332	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
333		423
334	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
335		425
336	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
337		427
338	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
339	}	432	}
340		433
341	sub mouse_motion { }	434	sub mouse_motion { }
342	sub button_up { }	435	sub button_up { }
343	sub key_down { }	436	sub key_down { }
344	sub key_up { }	437	sub key_up { }
345		438
346	sub button_down {	439	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
348		441
349	$self->focus_in;	442	$self->focus_in;
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	477	glPushMatrix;
385	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	481	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
392	glEnd;	485	glEnd;
393	glPopMatrix;	486	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	488	}
396	}	489	}
…		…
416	sub set_parent {	509	sub set_parent {
417	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
418		511
419	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
420		513
421	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
422	$self->check_size	516	$self->check_size;
423	unless exists $self->{req_w};	517	$self->show;
424	}	518	}
425		519
426	sub check_size {	520	sub check_size {
427	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
428		522
…		…
441	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
442		536
443	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}	538	}
445		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
446	sub emit {	546	sub emit {
447	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
448		548
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
450	}	555	}
451		556
452	sub DESTROY {	557	sub DESTROY {
453	my ($self) = @_;	558	my ($self) = @_;
454		559
…		…
567	delete $child->{parent};	672	delete $child->{parent};
568	$child->hide;	673	$child->hide;
569		674
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		676
572	$self->check_size;	677	$self->check_size (1);
573	$self->update;	678	$self->update;
574	}	679	}
575		680
576	sub clear {	681	sub clear {
577	my ($self) = @_;	682	my ($self) = @_;
…		…
717		822
718	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
719		824
720	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
721		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
722	sub size_request {	837	sub size_request {
723	my ($self) = @_;	838	my ($self) = @_;
724		839
725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		841
728	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
729	}	843	}
730		844
731	sub size_allocate {	845	sub size_allocate {
732	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
733		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
734	$self->update;	852	$self->update;
735	}	853	}
736		854
737	sub set_offset {	855	sub set_offset {
738	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
789	my $class = shift;	907	my $class = shift;
790		908
791	my $self;	909	my $self;
792		910
793	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
794	vertical => 1,	912	vertical => 1,
795	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
796	connect_changed => sub {	914	on_changed => sub {
797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
798	},	916	},
799	;	917	;
800		918
801	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
802	vp => (new CFClient::UI::ViewPort expand => 1),	920	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
807	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
808	$self->add ($self->{vp});	926	$self->add ($self->{vp});
809	$self->add ($self->{slider});	927	$self->add ($self->{slider});
810		928
811	$self	929	$self
		930	}
		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812	}	949	}
813		950
814	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
815	# update viewport offset on scroll	952	# update viewport offset on scroll
816		953
…		…
867	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868		1005
869	sub new {	1006	sub new {
870	my $class = shift;	1007	my $class = shift;
871		1008
872	# TODO: user_x, user_y, overwrite moveto?
873
874	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
875	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
876	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
877	border => 0.6,	1012	border => 0.6,
878	toplevel => 1,	1013	is_toplevel => 1,
879	can_events => 1,	1014	can_events => 1,
880	@_	1015	@_
881	);	1016	);
882		1017
883	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
884	align => 0,	1019	align => 0,
…		…
937	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
938		1073
939	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
940	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
941		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
945	$self->check_size;	1082	$self->check_size;
946	};	1083	};
947		1084
948	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
949	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
952	$self->{motion} = sub {	1089	$self->{motion} = sub {
953	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
954		1091
955	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
956		1093
957	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
958	$self->update;	1098	$self->update;
959	};	1099	};
960	}	1100	}
961	}	1101	}
962		1102
…		…
1024	sub new {	1164	sub new {
1025	my $class = shift;	1165	my $class = shift;
1026		1166
1027	$class->SUPER::new (	1167	$class->SUPER::new (
1028	col_expand => [],	1168	col_expand => [],
1029	@_	1169	@_,
1030	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}	1175	}
1032		1176
1033	sub add {	1177	sub add {
1034	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1035		1179
1036	$child->set_parent ($self);	1180	$child->set_parent ($self);
1037	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1038		1182
1039	$child->check_size;	1183	$self->check_size (1);
1040	}	1184	}
1041		1185
1042	sub children {
1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044	}
1045
1046	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
1047	sub clear {	1187	sub clear {
1048	my ($self) = @_;	1188	my ($self) = @_;
1049		1189
1050	my @children = $self->children;	1190	my @children = $self->children;
1051	delete $self->{children};	1191	delete $self->{children};
…		…
1053	for (@children) {	1193	for (@children) {
1054	delete $_->{parent};	1194	delete $_->{parent};
1055	$_->hide;	1195	$_->hide;
1056	}	1196	}
1057		1197
		1198	$self->check_size (1);
1058	$self->update;	1199	$self->update;
1059	}	1200	}
1060		1201
1061	sub get_wh {	1202	sub get_wh {
1062	my ($self) = @_;	1203	my ($self) = @_;
…		…
1094	sub size_allocate {	1235	sub size_allocate {
1095	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1096		1237
1097	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1098		1239
1099	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1100	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1101		1242
1102	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1103	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1104	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1105	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1159	}	1300	}
1160	}	1301	}
1161		1302
1162	#############################################################################	1303	#############################################################################
1163		1304
1164	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1165
1166	# TODO: wrap into common Box base class
1167		1306
1168	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1169		1308
1170	sub size_request {	1309	sub size_request {
1171	my ($self) = @_;	1310	my ($self) = @_;
1172		1311
1173	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1174		1313	? (
1175	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1176	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177	(List::Util::max map $_->[1], @alloc),	1316	)
1178	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1179	}	1321	}
1180		1322
1181	sub size_allocate {	1323	sub size_allocate {
1182	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1183		1325
1184	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1185
1186	my $children = $self->{children};	1327	my $children = $self->{children};
1187		1328
1188	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1189
1190	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1191		1331
1192	if ($req_h > $h) {	1332	if ($req > $space) {
1193	# ah well, not enough space	1333	# ah well, not enough space
1194	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1195	} else {	1335	} else {
1196	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197	$exp ||= 1;
1198		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1199	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1200	my $child = $children->[$_];
1201
1202	my $alloc_h = $h[$_];
1203	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204	$h[$_] = $alloc_h;
1205	}
1206	}	1340	}
1207		1341
1208	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1209		1343
1210	my $y = 0;	1344	my $pos = 0;
1211	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1212	my $child = $children->[$_];
1213	my $h = $h[$_];	1346	my $alloc = $req[$_];
1214	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215		1348
1216	$y += $h;	1349	$pos += $alloc;
1217	}	1350	}
1218		1351
1219	1	1352	1
1220	}	1353	}
1221		1354
1222	#############################################################################	1355	#############################################################################
1223		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1224	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1225		1373
1226	# TODO: wrap into common Box base class
1227
1228	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1229		1375
1230	sub size_request {	1376	sub new {
1231	my ($self) = @_;	1377	my $class = shift;
1232		1378
1233	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1234		1380	vertical => 1,
1235	(	1381	@_,
1236	(List::Util::max map $_->[0], @alloc),
1237	(List::Util::sum map $_->[1], @alloc),
1238	)	1382	)
1239	}
1240
1241	sub size_allocate {
1242	my ($self, $w, $h) = @_;
1243
1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246	my $children = $self->{children};
1247
1248	my @h = map $_->{req_h}, @$children;
1249
1250	my $req_h = List::Util::sum @h;
1251
1252	if ($req_h > $h) {
1253	# ah well, not enough space
1254	$_ *= $h / $req_h for @h;
1255	} else {
1256	my $exp = List::Util::sum map $_->{expand}, @$children;
1257	$exp ||= 1;
1258
1259	for (0 .. $#$children) {
1260	my $child = $children->[$_];
1261
1262	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263	}
1264	}
1265
1266	CFClient::UI::harmonize \@h;
1267
1268	my $y = 0;
1269	for (0 .. $#$children) {
1270	my $child = $children->[$_];
1271	my $h = $h[$_];
1272	$child->configure (0, $y, $w, $h);
1273
1274	$y += $h;
1275	}
1276
1277	1
1278	}	1383	}
1279		1384
1280	#############################################################################	1385	#############################################################################
1281		1386
1282	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
…		…
1466	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1467	can_hover => 1,	1572	can_hover => 1,
1468	can_focus => 1,	1573	can_focus => 1,
1469	valign => 0,	1574	valign => 0,
1470	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1471	@_	1577	@_
1472	)	1578	)
1473	}	1579	}
1474		1580
1475	sub _set_text {	1581	sub _set_text {
…		…
1485	$self->{text} = $text;	1591	$self->{text} = $text;
1486		1592
1487	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1488	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1489		1595
1490	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1491	}	1597	}
1492		1598
1493	sub set_text {	1599	sub set_text {
1494	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1495		1601
…		…
1507	my ($self) = @_;	1613	my ($self) = @_;
1508		1614
1509	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1510		1616
1511	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1512	}
1513
1514	sub size_allocate {
1515	my ($self, $w, $h) = @_;
1516
1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518	}	1618	}
1519		1619
1520	sub key_down {	1620	sub key_down {
1521	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1522		1622
…		…
1537	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1538	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1539	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1540	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1541	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1542	$self->emit ('escape');	1642	$self->_emit ('escape');
1543	} elsif ($uni) {	1643	} elsif ($uni) {
1544	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1545	}	1645	}
1546		1646
1547	$self->_set_text ($text);	1647	$self->_set_text ($text);
…		…
1634	if ($sym == 13) {	1734	if ($sym == 13) {
1635	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1636	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1637	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1638	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1639	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1640	$self->update;	1740	$self->update;
1641		1741
1642	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1643	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1644	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1692	can_events => 1,	1792	can_events => 1,
1693	@_	1793	@_
1694	)	1794	)
1695	}	1795	}
1696		1796
		1797	sub activate { }
		1798
1697	sub button_up {	1799	sub button_up {
1698	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1699		1801
		1802	$self->emit ("activate")
1700	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1701	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1702	$self->emit ("activate");
1703	}
1704	}	1805	}
1705		1806
1706	sub _draw {	1807	sub _draw {
1707	my ($self) = @_;	1808	my ($self) = @_;
1708		1809
…		…
1760	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1761		1862
1762	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1765	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1766	}	1867	}
1767	}	1868	}
1768		1869
1769	sub _draw {	1870	sub _draw {
1770	my ($self) = @_;	1871	my ($self) = @_;
…		…
2045	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2046	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2047	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
2048	bg => [0, 0, 0, 0.2],	2149	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],	2150	active_bg => [1, 1, 1, 0.5],
2050	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2051	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2052	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2053	vertical => 0,	2154	vertical => 0,
2054	can_hover => 1,	2155	can_hover => 1,
2055	inner_pad => 0.02,	2156	inner_pad => 0.02,
…		…
2060	$self->update;	2161	$self->update;
2061		2162
2062	$self	2163	$self
2063	}	2164	}
2064		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
2065	sub set_value {	2175	sub set_value {
2066	my ($self, $value) = @_;	2176	my ($self, $value) = @_;
2067		2177
2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069		2179
2070	$hi = $lo + 1 if $hi <= $lo;	2180	$hi = $lo + 1 if $hi <= $lo;
2071		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
2072	$value = $lo if $value < $lo;	2184	$value = $lo if $value < $lo;
2073	$value = $hi if $value > $hi;	2185	$value = $hi - $page if $value > $hi - $page;
2074		2186
2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076	if $unit;	2188	if $unit;
2077		2189
2078	$page = $hi - $lo if $page > $hi - $lo;
2079
2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081		2191
2082	if ($value != $old_value) {	2192	if ($value != $old_value) {
2083	$self->emit (changed => $value);	2193	$self->_emit (changed => $value);
2084	$self->update;	2194	$self->update;
2085	}	2195	}
2086	}	2196	}
2087		2197
2088	sub size_request {	2198	sub size_request {
…		…
2096		2206
2097	sub button_down {	2207	sub button_down {
2098	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2099		2209
2100	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
2101	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2102	}	2215	}
2103		2216
2104	sub mouse_motion {	2217	sub mouse_motion {
2105	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
…		…
2107	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109		2222
2110	my (undef, $lo, $hi, $page) = @{$self->{range}};	2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
2111		2224
2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113		2226
2114	$self->set_value ($x * ($hi - $lo) + $lo);	2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115	}	2228	}
2116	}	2229	}
2117		2230
2118	sub update {	2231	sub update {
2119	my ($self) = @_;	2232	my ($self) = @_;
2120		2233
2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122	$self->set_value ($self->{range}[0]);	2235	$self->set_value ($self->{range}[0]);
2123		2236
2124	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2125		2239
2126	my $inner_w = 1 - 2 * $self->{inner_pad};	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127		2241
2128	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129		2244
2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2245	$value = ($value - $lo) / $range;
2131	$value = $self->{scale} * ($value - $lo);	2246	$value = $value * $self->{scale} + $self->{offset};
2132		2247
2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135	$value = 0 if $value < 0;
2136	$page = 1 - $value if $value + $page > 1;
2137
2138	$self->{knob_x} = $value;	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2139	$self->{knob_w} = $page;	2249	$self->{knob_w} = $knob_w;
2140	});	2250	});
2141		2251
2142	$self->SUPER::update;	2252	$self->SUPER::update;
2143	}	2253	}
2144		2254
…		…
2168	# draw handle	2278	# draw handle
2169	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170		2280
2171	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2172	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2173		2324
2174	#############################################################################	2325	#############################################################################
2175		2326
2176	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2177		2328
…		…
2207		2358
2208	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2209	$self->reflow;	2360	$self->reflow;
2210	}	2361	}
2211		2362
2212	sub text_height {
2213	my ($self, $text) = @_;
2214
2215	my $layout = $self->{layout};
2216
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});
2219	$layout->set_markup ($text);
2220
2221	($layout->size)[1]
2222	}
2223
2224	sub reflow {
2225	my ($self) = @_;
2226
2227	$self->{need_reflow}++;
2228	$self->update;
2229	}
2230
2231	sub size_allocate {	2363	sub size_allocate {
2232	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2233		2365
2234	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2235		2367
…		…
2238	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2239		2371
2240	$self->reflow;	2372	$self->reflow;
2241	}	2373	}
2242		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2243	sub add_paragraph {	2409	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2245		2411
2246	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2247		2413	my ($w, $h) = $self->text_size ($line);
2248	my $height = $self->text_height ($text);
2249
2250	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2251		2417
2252	push @{$self->{par}}, [$height, $color, $text];
2253
2254	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255	$self->{children}[1]->update;
2256	}	2419	}
2257		2420
2258	sub update {	2421	sub update {
2259	my ($self) = @_;	2422	my ($self) = @_;
2260		2423
…		…
2263	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2264		2427
2265	delete $self->{texture};	2428	delete $self->{texture};
2266		2429
2267	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2268	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2269	my $height = 0;	2434	my $height = 0;
2270		2435
2271	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2272	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2273		2451
2274	$self->{height} = $height;	2452	$self->{height} = $height;
2275		2453
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277		2455
2278	delete $self->{texture};	2456	delete $self->{texture};
2279	}	2457	}
2280		2458
2281	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282	glClearColor 0.5, 0.5, 0.5, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2284		2462
2285	glEnable GL_TEXTURE_2D;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2289		2464
2290	my $y0 = $top;	2465	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2292		2467
2293	my $y = 0;	2468	my $y = 0;
2294		2469
2295	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2296		2471
2297	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2298		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2299	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2300	my $h = $par->[0];	2479	my $h = $par->[1];
2301		2480
2302	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2304	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2305		2485
2306	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308	}	2490	}
2309		2491
2310	$y += $h;	2492	$y += $h;
2311	}	2493	}
2312		2494
2313	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2314	};	2496	};
2315	});	2497	});
2316	}	2498	}
2317		2499
2318	sub _draw {	2500	sub _draw {
…		…
2378		2560
2379	sub new {	2561	sub new {
2380	my $class = shift;	2562	my $class = shift;
2381		2563
2382	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2383	state => 0,	2565	state => 0,
2384	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2385	@_	2567	@_
2386	);	2568	);
2387		2569
2388	if ($self->{state}) {
2389	$self->{state} = 0;
2390	$self->toggle_flopper;
2391	}
2392
2393	$self	2570	$self
2394	}	2571	}
2395		2572
2396	sub toggle_flopper {	2573	sub toggle_flopper {
2397	my ($self) = @_;	2574	my ($self) = @_;
2398		2575
2399	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2400	if ($self->{state} = !$self->{state}) {
2401	$CFClient::UI::ROOT->add ($self->{other});
2402	$self->{other}->move ($self->coord2global (0, $self->{h}));
2403	$self->emit ("open");
2404	} else {
2405	$CFClient::UI::ROOT->remove ($self->{other});
2406	$self->emit ("close");
2407	}
2408
2409	$self->emit (changed => $self->{state});
2410	}	2577	}
2411		2578
2412	#############################################################################	2579	#############################################################################
2413		2580
2414	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2490		2657
2491	sub new {	2658	sub new {
2492	my $class = shift;	2659	my $class = shift;
2493		2660
2494	my $self = $class->SUPER::new (	2661	my $self = $class->SUPER::new (
2495	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2496	@_,	2664	@_,
2497	);	2665	);
2498		2666
2499	if ($self->{anim} && $self->{animspeed}) {	2667	if ($self->{anim} && $self->{animspeed}) {
2500	Scalar::Util::weaken (my $widget = $self);	2668	Scalar::Util::weaken (my $widget = $self);
…		…
2515		2683
2516	sub size_request {	2684	sub size_request {
2517	(32, 8)	2685	(32, 8)
2518	}	2686	}
2519		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2520	sub _draw {	2696	sub _draw {
2521	my ($self) = @_;	2697	my ($self) = @_;
2522		2698
2523	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
2524		2700
2525	my $face;	2701	my $face;
2526		2702
2527	if ($self->{frame}) {	2703	if ($self->{frame}) {
2528	my $anim = $::CONN->{anim}[$self->{anim}];	2704	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2551	$self->SUPER::DESTROY;	2727	$self->SUPER::DESTROY;
2552	}	2728	}
2553		2729
2554	#############################################################################	2730	#############################################################################
2555		2731
2556	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2557		2733
2558	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2559
2560	sub _item_to_desc {
2561	my ($item) = @_;
2562
2563	my $desc =
2564	$item->{nrof} < 2
2565	? $item->{name}
2566	: "$item->{nrof} × $item->{name_pl}";
2567
2568	$item->{flags} & Crossfire::Protocol::F_OPEN
2569	and $desc .= " (open)";
2570	$item->{flags} & Crossfire::Protocol::F_APPLIED
2571	and $desc .= " (applied)";
2572	$item->{flags} & Crossfire::Protocol::F_UNPAID
2573	and $desc .= " (unpaid)";
2574	$item->{flags} & Crossfire::Protocol::F_MAGIC
2575	and $desc .= " (magic)";
2576	$item->{flags} & Crossfire::Protocol::F_CURSED
2577	and $desc .= " (cursed)";
2578	$item->{flags} & Crossfire::Protocol::F_DAMNED
2579	and $desc .= " (damned)";
2580	$item->{flags} & Crossfire::Protocol::F_LOCKED
2581	and $desc .= " *";
2582
2583	$desc
2584	}
2585		2735
2586	sub new {	2736	sub new {
2587	my $class = shift;	2737	my $class = shift;
2588		2738
2589	my %args = @_;
2590
2591	my $item = delete $args{item};
2592
2593	my $desc = _item_to_desc ($item);
2594
2595	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2596	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2597	can_events => 1,
2598	tooltip => ((CFClient::UI::Label::escape $desc)
2599	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600	connect_button_down => sub {
2601	my ($self, $ev, $x, $y) = @_;
2602
2603	# todo: maybe put examine on 1? but should just be a tooltip :(
2604	if ($ev->{button} == 1) {
2605	my $targ = $::CONN->{player}{tag};
2606
2607	if ($item->{container} == $::CONN->{player}{tag}) {
2608	$targ = $main::OPENCONT;
2609	}
2610
2611	$::CONN->send ("move $targ $item->{tag} 0");
2612	} elsif ($ev->{button} == 2) {
2613	$::CONN->send ("apply $item->{tag}");
2614	} elsif ($ev->{button} == 3) {
2615	my @menu_items = (
2616	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2620	[
2621	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2622	sub { $::CONN->send ("lock $item->{tag}") },
2623	],
2624	);
2625
2626	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2627	}
2628
2629	1
2630	},
2631	%args
2632	);
2633
2634
2635	$self->add (new CFClient::UI::Face
2636	can_events => 0,
2637	face => $item->{face},
2638	anim => $item->{anim},
2639	animspeed => $item->{animspeed},
2640	);
2641
2642	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2643
2644	$self->{item} = $item;
2645
2646	$self->update_item;
2647
2648	$self
2649	}
2650
2651	sub update_item {
2652	my ($self) = @_;
2653
2654	my $desc = _item_to_desc ($self->{item});
2655
2656	$self->{name_lbl}->set_text ($desc);
2657	}
2658
2659	#############################################################################
2660
2661	package CFClient::UI::Inventory;
2662
2663	our @ISA = CFClient::UI::ScrolledWindow::;
2664
2665	sub new {
2666	my $class = shift;
2667
2668	my $self = $class->SUPER::new (
2669	scrolled => (new CFClient::UI::VBox),
2670	@_,	2741	@_,
2671	);	2742	);
2672		2743
2673	$self	2744	$self
2674	}	2745	}
…		…
2684	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2685	} @$items;	2756	} @$items;
2686		2757
2687	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2688		2759
		2760	my $row = 0;
2689	for my $item (@items) {	2761	for my $item (@items) {
2690	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	CFClient::Item::update_widgets $item;
2691	$item->update_item ();
2692	}
2693		2763
2694	$self->{scrolled}->add (@items);	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2695		2767
2696	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2768	$row++;
2697	}	2769	}
2698
2699	sub size_request {
2700	my ($self) = @_;
2701	($self->{req_w}, $self->{req_h});
2702	}	2770	}
2703		2771
2704	#############################################################################	2772	#############################################################################
2705		2773
2706	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2741		2809
2742	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2743	sub popup {	2811	sub popup {
2744	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2745		2813
2746	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2747		2815
2748	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2749	$GRAB = $self;	2817	$GRAB = $self;
2750	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2751		2819
…		…
2766		2834
2767	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2768	undef $GRAB;	2836	undef $GRAB;
2769	$self->hide;	2837	$self->hide;
2770		2838
2771	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2772	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2773	}	2841	}
2774	}	2842	}
2775		2843
2776	#############################################################################	2844	#############################################################################
…		…
2838	sub add {	2906	sub add {
2839	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2840		2908
2841	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2842	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2843		2913
2844	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2845		2915
2846	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2847		2917
…		…
2891		2961
2892	sub new {	2962	sub new {
2893	my $class = shift;	2963	my $class = shift;
2894		2964
2895	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2896	@_,	2967	@_,
2897	)	2968	)
2898	}	2969	}
2899		2970
2900	sub configure {	2971	sub configure {
…		…
2918	}	2989	}
2919		2990
2920	sub size_allocate {	2991	sub size_allocate {
2921	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2922		2993
2923	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2924	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2925
2926	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2927	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2928
2929	for my $child ($self->children) {	2994	for my $child ($self->children) {
2930	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2931		2996
2932	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2933	if exists $child->{req_x};	2998	if exists $child->{req_x};
2934		2999
2935	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2936	if exists $child->{req_y};	3001	if exists $child->{req_y};
2937		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2938	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2939	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940		3007
2941	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2942	}	3009	}
…		…
2963		3030
2964	sub add {	3031	sub add {
2965	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2966		3033
2967	for my $child (@children) {	3034	for my $child (@children) {
2968	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
2969		3036
2970	# integerise window positions	3037	# integerise window positions
2971	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2972	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
2973	}	3040	}
2974		3041
2975	$self->SUPER::add (@children);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2976	}	3061	}
2977		3062
2978	sub on_refresh {	3063	sub on_refresh {
2979	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2980		3065
…		…
2994	$_->()	3079	$_->()
2995	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2996	}	3081	}
2997		3082
2998	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2999	my @queue = ([], []);	3084	my @queue;
3000		3085
3001	for (;;) {	3086	for (;;) {
3002	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
3003	# heuristic: check containers last	3088	#TODO use array-of-depth approach
3004	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
3005	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
3006	}	3092	}
3007		3093
3008	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
3009		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
3010	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3011	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
3012	: $widget->size_request;	3100	: $widget->size_request;
3013		3101
3014	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
3015	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3016	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3033	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
3034	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
3035		3123
3036	$widget->{w} = $w;	3124	$widget->{w} = $w;
3037	$widget->{h} = $h;	3125	$widget->{h} = $h;
3038	$widget->size_allocate ($w, $h);
3039	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
3040	}	3127	}
3041	}	3128	}
3042		3129
3043	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
3049	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3050	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
3051		3138
3052	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
3053	glLoadIdentity;	3140	glLoadIdentity;
3054	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3055	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
3056	glLoadIdentity;	3143	glLoadIdentity;
3057		3144
3058	$self->_draw;	3145	$self->_draw;
3059	}	3146	}

Diff Legend

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