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.221 by root, Mon May 22 03:48:50 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) = @_;
…		…
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	for (my @w = $self; @w; ) {
213	my $w = pop @w;
214	push @w, $w->children;
215	$w->{visible} = 1;
216	}
217
218	return if $self->{parent};	245	return if $self->{parent};
219		246
220	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
221	}	248	}
222		249
223	sub hide {	250	sub show_centered {
224	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
225		253
226	for (my @w = $self; @w; ) {	254	$self->show;
227	my $w = pop @w;	255
228	push @w, $w->children;	256	$CFClient::UI::ROOT->on_post_alloc (
229	$w->{visible} = 1;	257	"centered $self" => sub {
230	}	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};
231		283
232	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
233	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;
234		299
235	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
236	if $self->{parent};	301	if $self->{parent};
237	}	302	}
238		303
…		…
247	}	312	}
248		313
249	sub set_size {	314	sub set_size {
250	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
251		316
252	$self->{user_w} = $w;	317	$self->{def_w} = $w;
253	$self->{user_h} = $h;	318	$self->{def_h} = $h;
254		319
255	$self->check_size;	320	$self->check_size;
256	}	321	}
257		322
258	sub size_request {	323	sub size_request {
…		…
308	}	373	}
309		374
310	sub set_tooltip {	375	sub set_tooltip {
311	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
312		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
313	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
314		384
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
317	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
338	return if $FOCUS == $self;	408	return if $FOCUS == $self;
339	return unless $self->{can_focus};	409	return unless $self->{can_focus};
340		410
341	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
342		412
343	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
344		414
345	$focus->update if $focus;	415	$focus->update if $focus;
346	$FOCUS->update;	416	$FOCUS->update;
347	}	417	}
348		418
…		…
351		421
352	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
353		423
354	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
355		425
356	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
357		427
358	$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;
359	}	432	}
360		433
361	sub mouse_motion { }	434	sub mouse_motion { }
362	sub button_up { }	435	sub button_up { }
363	sub key_down { }	436	sub key_down { }
364	sub key_up { }	437	sub key_up { }
365		438
366	sub button_down {	439	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
368		441
369	$self->focus_in;	442	$self->focus_in;
…		…
403	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;	477	glPushMatrix;
405	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	481	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
412	glEnd;	485	glEnd;
413	glPopMatrix;	486	glPopMatrix;
414	#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;
415	}	488	}
416	}	489	}
…		…
436	sub set_parent {	509	sub set_parent {
437	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
438		511
439	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
440		513
441	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
442	$self->check_size	516	$self->check_size;
443	unless exists $self->{req_w};
444
445	$self->show;	517	$self->show;
446	}	518	}
447		519
448	sub check_size {	520	sub check_size {
449	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
…		…
463	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
464		536
465	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}	538	}
467		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
468	sub emit {	546	sub emit {
469	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
470		548
471	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) = @_;
472	}	555	}
473		556
474	sub DESTROY {	557	sub DESTROY {
475	my ($self) = @_;	558	my ($self) = @_;
476		559
…		…
589	delete $child->{parent};	672	delete $child->{parent};
590	$child->hide;	673	$child->hide;
591		674
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		676
594	$self->check_size;	677	$self->check_size (1);
595	$self->update;	678	$self->update;
596	}	679	}
597		680
598	sub clear {	681	sub clear {
599	my ($self) = @_;	682	my ($self) = @_;
…		…
739		822
740	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
741		824
742	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
743		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
744	sub size_request {	837	sub size_request {
745	my ($self) = @_;	838	my ($self) = @_;
746		839
747	@$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)};
748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
749		841
750	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
751	}	843	}
752		844
753	sub size_allocate {	845	sub size_allocate {
754	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
755		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);
756	$self->update;	852	$self->update;
757	}	853	}
758		854
759	sub set_offset {	855	sub set_offset {
760	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	907	my $class = shift;
812		908
813	my $self;	909	my $self;
814		910
815	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
816	vertical => 1,	912	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	914	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
820	},	916	},
821	;	917	;
822		918
823	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	920	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	926	$self->add ($self->{vp});
831	$self->add ($self->{slider});	927	$self->add ($self->{slider});
832		928
833	$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]);
834	}	949	}
835		950
836	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	952	# update viewport offset on scroll
838		953
…		…
889	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);
890		1005
891	sub new {	1006	sub new {
892	my $class = shift;	1007	my $class = shift;
893		1008
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1012	border => 0.6,
900	toplevel => 1,	1013	is_toplevel => 1,
901	can_events => 1,	1014	can_events => 1,
902	@_	1015	@_
903	);	1016	);
904		1017
905	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1019	align => 0,
…		…
959	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
960		1073
961	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
963		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
967	$self->check_size;	1082	$self->check_size;
968	};	1083	};
969		1084
970	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
974	$self->{motion} = sub {	1089	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
976		1091
977	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
978		1093
979	$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});
980	$self->update;	1098	$self->update;
981	};	1099	};
982	}	1100	}
983	}	1101	}
984		1102
…		…
1046	sub new {	1164	sub new {
1047	my $class = shift;	1165	my $class = shift;
1048		1166
1049	$class->SUPER::new (	1167	$class->SUPER::new (
1050	col_expand => [],	1168	col_expand => [],
1051	@_	1169	@_,
1052	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1175	}
1054		1176
1055	sub add {	1177	sub add {
1056	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1057		1179
1058	$child->set_parent ($self);	1180	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1060		1182
1061	$child->check_size;	1183	$self->check_size (1);
1062	}	1184	}
1063		1185
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# 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?
1069	sub clear {	1187	sub clear {
1070	my ($self) = @_;	1188	my ($self) = @_;
1071		1189
1072	my @children = $self->children;	1190	my @children = $self->children;
1073	delete $self->{children};	1191	delete $self->{children};
…		…
1075	for (@children) {	1193	for (@children) {
1076	delete $_->{parent};	1194	delete $_->{parent};
1077	$_->hide;	1195	$_->hide;
1078	}	1196	}
1079		1197
		1198	$self->check_size (1);
1080	$self->update;	1199	$self->update;
1081	}	1200	}
1082		1201
1083	sub get_wh {	1202	sub get_wh {
1084	my ($self) = @_;	1203	my ($self) = @_;
…		…
1116	sub size_allocate {	1235	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1118		1237
1119	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1120		1239
1121	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1123		1242
1124	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1300	}
1182	}	1301	}
1183		1302
1184	#############################################################################	1303	#############################################################################
1185		1304
1186	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1187
1188	# TODO: wrap into common Box base class
1189		1306
1190	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1191		1308
1192	sub size_request {	1309	sub size_request {
1193	my ($self) = @_;	1310	my ($self) = @_;
1194		1311
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1196		1313	? (
1197	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1198	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199	(List::Util::max map $_->[1], @alloc),	1316	)
1200	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1201	}	1321	}
1202		1322
1203	sub size_allocate {	1323	sub size_allocate {
1204	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1205		1325
1206	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1207
1208	my $children = $self->{children};	1327	my $children = $self->{children};
1209		1328
1210	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1211
1212	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1213		1331
1214	if ($req_h > $h) {	1332	if ($req > $space) {
1215	# ah well, not enough space	1333	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1217	} else {	1335	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219	$exp ||= 1;
1220		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1221	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1222	my $child = $children->[$_];
1223
1224	my $alloc_h = $h[$_];
1225	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226	$h[$_] = $alloc_h;
1227	}
1228	}	1340	}
1229		1341
1230	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1231		1343
1232	my $y = 0;	1344	my $pos = 0;
1233	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];	1346	my $alloc = $req[$_];
1236	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237		1348
1238	$y += $h;	1349	$pos += $alloc;
1239	}	1350	}
1240		1351
1241	1	1352	1
1242	}	1353	}
1243		1354
1244	#############################################################################	1355	#############################################################################
1245		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
1246	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1247		1373
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1251		1375
1252	sub size_request {	1376	sub new {
1253	my ($self) = @_;	1377	my $class = shift;
1254		1378
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1256		1380	vertical => 1,
1257	(	1381	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1382	)
1261	}
1262
1263	sub size_allocate {
1264	my ($self, $w, $h) = @_;
1265
1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268	my $children = $self->{children};
1269
1270	my @h = map $_->{req_h}, @$children;
1271
1272	my $req_h = List::Util::sum @h;
1273
1274	if ($req_h > $h) {
1275	# ah well, not enough space
1276	$_ *= $h / $req_h for @h;
1277	} else {
1278	my $exp = List::Util::sum map $_->{expand}, @$children;
1279	$exp ||= 1;
1280
1281	for (0 .. $#$children) {
1282	my $child = $children->[$_];
1283
1284	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285	}
1286	}
1287
1288	CFClient::UI::harmonize \@h;
1289
1290	my $y = 0;
1291	for (0 .. $#$children) {
1292	my $child = $children->[$_];
1293	my $h = $h[$_];
1294	$child->configure (0, $y, $w, $h);
1295
1296	$y += $h;
1297	}
1298
1299	1
1300	}	1383	}
1301		1384
1302	#############################################################################	1385	#############################################################################
1303		1386
1304	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
…		…
1488	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1489	can_hover => 1,	1572	can_hover => 1,
1490	can_focus => 1,	1573	can_focus => 1,
1491	valign => 0,	1574	valign => 0,
1492	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1493	@_	1577	@_
1494	)	1578	)
1495	}	1579	}
1496		1580
1497	sub _set_text {	1581	sub _set_text {
…		…
1507	$self->{text} = $text;	1591	$self->{text} = $text;
1508		1592
1509	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1511		1595
1512	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1513	}	1597	}
1514		1598
1515	sub set_text {	1599	sub set_text {
1516	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1517		1601
…		…
1529	my ($self) = @_;	1613	my ($self) = @_;
1530		1614
1531	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1532		1616
1533	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1534	}
1535
1536	sub size_allocate {
1537	my ($self, $w, $h) = @_;
1538
1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540	}	1618	}
1541		1619
1542	sub key_down {	1620	sub key_down {
1543	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1544		1622
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1642	$self->_emit ('escape');
1565	} elsif ($uni) {	1643	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1645	}
1568		1646
1569	$self->_set_text ($text);	1647	$self->_set_text ($text);
…		…
1656	if ($sym == 13) {	1734	if ($sym == 13) {
1657	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1662	$self->update;	1740	$self->update;
1663		1741
1664	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1714	can_events => 1,	1792	can_events => 1,
1715	@_	1793	@_
1716	)	1794	)
1717	}	1795	}
1718		1796
		1797	sub activate { }
		1798
1719	sub button_up {	1799	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1721		1801
		1802	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1805	}
1727		1806
1728	sub _draw {	1807	sub _draw {
1729	my ($self) = @_;	1808	my ($self) = @_;
1730		1809
…		…
1782	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1783		1862
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1788	}	1867	}
1789	}	1868	}
1790		1869
1791	sub _draw {	1870	sub _draw {
1792	my ($self) = @_;	1871	my ($self) = @_;
…		…
2067	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2149	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2150	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2075	vertical => 0,	2154	vertical => 0,
2076	can_hover => 1,	2155	can_hover => 1,
2077	inner_pad => 0.02,	2156	inner_pad => 0.02,
…		…
2082	$self->update;	2161	$self->update;
2083		2162
2084	$self	2163	$self
2085	}	2164	}
2086		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
2087	sub set_value {	2175	sub set_value {
2088	my ($self, $value) = @_;	2176	my ($self, $value) = @_;
2089		2177
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2179
2092	$hi = $lo + 1 if $hi <= $lo;	2180	$hi = $lo + 1 if $hi <= $lo;
2093		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
2094	$value = $lo if $value < $lo;	2184	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2185	$value = $hi - $page if $value > $hi - $page;
2096		2186
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2188	if $unit;
2099		2189
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2191
2104	if ($value != $old_value) {	2192	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2193	$self->_emit (changed => $value);
2106	$self->update;	2194	$self->update;
2107	}	2195	}
2108	}	2196	}
2109		2197
2110	sub size_request {	2198	sub size_request {
…		…
2118		2206
2119	sub button_down {	2207	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2121		2209
2122	$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
2123	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2124	}	2215	}
2125		2216
2126	sub mouse_motion {	2217	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2222
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2224
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2226
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2228	}
2138	}	2229	}
2139		2230
2140	sub update {	2231	sub update {
2141	my ($self) = @_;	2232	my ($self) = @_;
2142		2233
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2235	$self->set_value ($self->{range}[0]);
2145		2236
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2147		2239
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2241
2150	$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;
2151		2244
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2245	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2246	$value = $value * $self->{scale} + $self->{offset};
2154		2247
2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157	$value = 0 if $value < 0;
2158	$page = 1 - $value if $value + $page > 1;
2159
2160	$self->{knob_x} = $value;	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2249	$self->{knob_w} = $knob_w;
2162	});	2250	});
2163		2251
2164	$self->SUPER::update;	2252	$self->SUPER::update;
2165	}	2253	}
2166		2254
…		…
2190	# draw handle	2278	# draw handle
2191	$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);
2192		2280
2193	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2194	}	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 (@_) }
2195		2324
2196	#############################################################################	2325	#############################################################################
2197		2326
2198	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2199		2328
…		…
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2371
2243	$self->reflow;	2372	$self->reflow;
2244	}	2373	}
2245		2374
2246	sub text_height {	2375	sub text_size {
2247	my ($self, $text, $indent) = @_;	2376	my ($self, $text, $indent) = @_;
2248		2377
2249	my $layout = $self->{layout};	2378	my $layout = $self->{layout};
2250		2379
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2381	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2382	$layout->set_markup ($text);
2254		2383
2255	($layout->size)[1]	2384	$layout->size
2256	}	2385	}
2257		2386
2258	sub reflow {	2387	sub reflow {
2259	my ($self) = @_;	2388	my ($self) = @_;
2260		2389
2261	$self->{need_reflow}++;	2390	$self->{need_reflow}++;
2262	$self->update;	2391	$self->update;
2263	}	2392	}
2264		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
2265	sub add_paragraph {	2409	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2267		2411
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2412	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2413	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2414	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2416	}
2275		2417
2276	$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]);
2277	$self->{children}[1]->update;
2278	}	2419	}
2279		2420
2280	sub update {	2421	sub update {
2281	my ($self) = @_;	2422	my ($self) = @_;
2282		2423
…		…
2285	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2286		2427
2287	delete $self->{texture};	2428	delete $self->{texture};
2288		2429
2289	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2290	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2434	my $height = 0;
2292		2435
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2294	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	}
2295		2451
2296	$self->{height} = $height;	2452	$self->{height} = $height;
2297		2453
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2455
2301	delete $self->{texture};	2456	delete $self->{texture};
2302	}	2457	}
2303		2458
2304	$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 {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2307		2462
2308	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2309		2464
2310	my $y0 = $top;	2465	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2312		2467
2313	my $y = 0;	2468	my $y = 0;
2314		2469
2315	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2316		2471
2317	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2318		2473
2319	glEnable GL_BLEND;	2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2477
2322	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2479	my $h = $par->[1];
2324		2480
2325	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2483	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2484	$layout->set_markup ($par->[4]);
2329		2485
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2487
2332	glRasterPos $par->[2], $y - $y0;	2488	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2490	}
2335		2491
2336	$y += $h;	2492	$y += $h;
2337	}	2493	}
…		…
2404		2560
2405	sub new {	2561	sub new {
2406	my $class = shift;	2562	my $class = shift;
2407		2563
2408	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2409	state => 0,	2565	state => 0,
2410	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2411	@_	2567	@_
2412	);	2568	);
2413		2569
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2570	$self
2420	}	2571	}
2421		2572
2422	sub toggle_flopper {	2573	sub toggle_flopper {
2423	my ($self) = @_;	2574	my ($self) = @_;
2424		2575
2425	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2426	if ($self->{state} = !$self->{state}) {
2427	$CFClient::UI::ROOT->add ($self->{other});
2428	$self->{other}->move ($self->coord2global (0, $self->{h}));
2429	$self->emit ("open");
2430	} else {
2431	$CFClient::UI::ROOT->remove ($self->{other});
2432	$self->emit ("close");
2433	}
2434
2435	$self->emit (changed => $self->{state});
2436	}	2577	}
2437		2578
2438	#############################################################################	2579	#############################################################################
2439		2580
2440	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2516		2657
2517	sub new {	2658	sub new {
2518	my $class = shift;	2659	my $class = shift;
2519		2660
2520	my $self = $class->SUPER::new (	2661	my $self = $class->SUPER::new (
2521	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2522	@_,	2664	@_,
2523	);	2665	);
2524		2666
2525	if ($self->{anim} && $self->{animspeed}) {	2667	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2668	Scalar::Util::weaken (my $widget = $self);
…		…
2541		2683
2542	sub size_request {	2684	sub size_request {
2543	(32, 8)	2685	(32, 8)
2544	}	2686	}
2545		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2546	sub _draw {	2696	sub _draw {
2547	my ($self) = @_;	2697	my ($self) = @_;
2548		2698
2549	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
2550		2700
2551	my $face;	2701	my $face;
2552		2702
2553	if ($self->{frame}) {	2703	if ($self->{frame}) {
2554	my $anim = $::CONN->{anim}[$self->{anim}];	2704	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2577	$self->SUPER::DESTROY;	2727	$self->SUPER::DESTROY;
2578	}	2728	}
2579		2729
2580	#############################################################################	2730	#############################################################################
2581		2731
2582	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2583		2733
2584	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2585
2586	sub _item_to_desc {
2587	my ($item) = @_;
2588
2589	my $desc =
2590	$item->{nrof} < 2
2591	? $item->{name}
2592	: "$item->{nrof} × $item->{name_pl}";
2593
2594	$item->{flags} & Crossfire::Protocol::F_OPEN
2595	and $desc .= " (open)";
2596	$item->{flags} & Crossfire::Protocol::F_APPLIED
2597	and $desc .= " (applied)";
2598	$item->{flags} & Crossfire::Protocol::F_UNPAID
2599	and $desc .= " (unpaid)";
2600	$item->{flags} & Crossfire::Protocol::F_MAGIC
2601	and $desc .= " (magic)";
2602	$item->{flags} & Crossfire::Protocol::F_CURSED
2603	and $desc .= " (cursed)";
2604	$item->{flags} & Crossfire::Protocol::F_DAMNED
2605	and $desc .= " (damned)";
2606	$item->{flags} & Crossfire::Protocol::F_LOCKED
2607	and $desc .= " *";
2608
2609	$desc
2610	}
2611		2735
2612	sub new {	2736	sub new {
2613	my $class = shift;	2737	my $class = shift;
2614		2738
2615	my %args = @_;
2616
2617	my $item = delete $args{item};
2618
2619	my $desc = _item_to_desc ($item);
2620
2621	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2622	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2623	can_events => 1,
2624	tooltip => ((CFClient::UI::Label::escape $desc)
2625	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626	connect_button_down => sub {
2627	my ($self, $ev, $x, $y) = @_;
2628
2629	# todo: maybe put examine on 1? but should just be a tooltip :(
2630	if ($ev->{button} == 1) {
2631	my $targ = $::CONN->{player}{tag};
2632
2633	if ($item->{container} == $::CONN->{player}{tag}) {
2634	$targ = $main::OPENCONT;
2635	}
2636
2637	$::CONN->send ("move $targ $item->{tag} 0");
2638	} elsif ($ev->{button} == 2) {
2639	$::CONN->send ("apply $item->{tag}");
2640	} elsif ($ev->{button} == 3) {
2641	my @menu_items = (
2642	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645	(
2646	$item->{flags} & Crossfire::Protocol::F_LOCKED
2647	? (
2648	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649	)
2650	: (
2651	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653	)
2654	),
2655	);
2656
2657	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658	}
2659
2660	1
2661	},
2662	%args
2663	);
2664
2665
2666	$self->add (new CFClient::UI::Face
2667	can_events => 0,
2668	face => $item->{face},
2669	anim => $item->{anim},
2670	animspeed => $item->{animspeed},
2671	);
2672
2673	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675	$self->{item} = $item;
2676
2677	$self->update_item;
2678
2679	$self
2680	}
2681
2682	sub update_item {
2683	my ($self) = @_;
2684
2685	my $desc = _item_to_desc ($self->{item});
2686
2687	$self->{name_lbl}->set_text ($desc);
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI::Inventory;
2693
2694	our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696	sub new {
2697	my $class = shift;
2698
2699	my $self = $class->SUPER::new (
2700	scrolled => (new CFClient::UI::VBox),
2701	@_,	2741	@_,
2702	);	2742	);
2703		2743
2704	$self	2744	$self
2705	}	2745	}
…		…
2715	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2716	} @$items;	2756	} @$items;
2717		2757
2718	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2719		2759
		2760	my $row = 0;
2720	for my $item (@items) {	2761	for my $item (@items) {
2721	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2762	CFClient::Item::update_widgets $item;
2722	$item->update_item ();
2723	}
2724		2763
2725	$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});
2726		2767
2727	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2768	$row++;
2728	}	2769	}
2729
2730	sub size_request {
2731	my ($self) = @_;
2732	($self->{req_w}, $self->{req_h});
2733	}	2770	}
2734		2771
2735	#############################################################################	2772	#############################################################################
2736		2773
2737	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2772		2809
2773	# 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)
2774	sub popup {	2811	sub popup {
2775	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2776		2813
2777	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2778		2815
2779	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2780	$GRAB = $self;	2817	$GRAB = $self;
2781	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2782		2819
…		…
2797		2834
2798	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2799	undef $GRAB;	2836	undef $GRAB;
2800	$self->hide;	2837	$self->hide;
2801		2838
2802	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2803	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2804	}	2841	}
2805	}	2842	}
2806		2843
2807	#############################################################################	2844	#############################################################################
…		…
2869	sub add {	2906	sub add {
2870	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2871		2908
2872	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2873	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2874		2913
2875	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2876		2915
2877	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878		2917
…		…
2922		2961
2923	sub new {	2962	sub new {
2924	my $class = shift;	2963	my $class = shift;
2925		2964
2926	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2927	@_,	2967	@_,
2928	)	2968	)
2929	}	2969	}
2930		2970
2931	sub configure {	2971	sub configure {
…		…
2949	}	2989	}
2950		2990
2951	sub size_allocate {	2991	sub size_allocate {
2952	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2953		2993
2954	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960	for my $child ($self->children) {	2994	for my $child ($self->children) {
2961	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)};
2962		2996
2963	$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
2964	if exists $child->{req_x};	2998	if exists $child->{req_x};
2965		2999
2966	$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
2967	if exists $child->{req_y};	3001	if exists $child->{req_y};
2968		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2969	$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;
2970	$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;
2971		3007
2972	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2973	}	3009	}
…		…
2994		3030
2995	sub add {	3031	sub add {
2996	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2997		3033
2998	for my $child (@children) {	3034	for my $child (@children) {
2999	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
3000		3036
3001	# integerise window positions	3037	# integerise window positions
3002	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
3003	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
3004	}	3040	}
3005		3041
3006	$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	}
3007	}	3061	}
3008		3062
3009	sub on_refresh {	3063	sub on_refresh {
3010	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
3011		3065
…		…
3025	$_->()	3079	$_->()
3026	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
3027	}	3081	}
3028		3082
3029	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
3030	my @queue = ([], []);	3084	my @queue;
3031		3085
3032	for (;;) {	3086	for (;;) {
3033	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
3034	# heuristic: check containers last	3088	#TODO use array-of-depth approach
3035	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
3036	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
3037	}	3092	}
3038		3093
3039	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
3040		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
3041	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3042	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
3043	: $widget->size_request;	3100	: $widget->size_request;
3044		3101
3045	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
3046	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047	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#
…		…
3064	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
3065	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
3066		3123
3067	$widget->{w} = $w;	3124	$widget->{w} = $w;
3068	$widget->{h} = $h;	3125	$widget->{h} = $h;
3069	$widget->size_allocate ($w, $h);
3070	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
3071	}	3127	}
3072	}	3128	}
3073		3129
3074	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {

Diff Legend

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