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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
144		158
145	$_->update	159	$_->update
146	for @widgets;	160	for @widgets;
147	}	161	}
148		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
149	# call when resolution changes etc.	171	# call when resolution changes etc.
150	sub rescale_widgets {	172	sub rescale_widgets {
151	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
152		174
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166	}	183	}
167
168	$widget->reconfigure;
169	}	184	}
		185
		186	reconfigure_widgets;
170	}	187	}
171		188
172	#############################################################################	189	#############################################################################
173		190
174	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
187	can_events => 1,	204	can_events => 1,
188	@_	205	@_
189	}, $class;	206	}, $class;
190		207
191	for (keys %$self) {	208	for (keys %$self) {
192	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
194	}	211	}
195	}	212	}
196		213
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
199	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
200	}	234	}
201		235
202	sub destroy {	236	sub destroy {
203	my ($self) = @_;	237	my ($self) = @_;
204		238
…		…
211	return if $self->{parent};	245	return if $self->{parent};
212		246
213	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
214	}	248	}
215		249
216	sub show_centered {	250	sub center {
217	my ($self) = @_;	251	my ($self) = @_;
218	return if $self->{parent};
219
220	$self->show;
221		252
222	$CFClient::UI::ROOT->on_post_alloc (	253	$CFClient::UI::ROOT->on_post_alloc (
223	"centered $self" => sub {	254	"center_$self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},	256	},
226	);	257	);
227	}
228		258
229	sub hide {	259	$self->update;
		260	}
		261
		262	sub set_visible {
230	my ($self) = @_;	263	my ($self) = @_;
		264
		265	return if $self->{visible};
		266
		267	$self->{root} = $self->{parent}{root};
		268	$self->{visible} = $self->{parent}{visible} + 1;
		269
		270	$self->emit (visibility_change => 1)
		271	}
		272
		273	sub set_invisible {
		274	my ($self) = @_;
		275
		276	return unless $self->{visible};
		277
		278	# broken show/hide model
		279
		280	delete $self->{root};
		281	delete $self->{visible};
231		282
232	undef $GRAB if $GRAB == $self;	283	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	284	undef $HOVER if $HOVER == $self;
		285
		286	CFClient::UI::check_tooltip
		287	if $CFClient::UI::TOOLTIP->{owner} == $self;
		288
		289	$self->focus_out;
		290
		291	$self->emit (visibility_change => 0);
		292	}
		293
		294	sub hide {
		295	my ($self) = @_;
		296
		297	$self->set_invisible;
234		298
235	$self->{parent}->remove ($self)	299	$self->{parent}->remove ($self)
236	if $self->{parent};	300	if $self->{parent};
237	}	301	}
238		302
…		…
247	}	311	}
248		312
249	sub set_size {	313	sub set_size {
250	my ($self, $w, $h) = @_;	314	my ($self, $w, $h) = @_;
251		315
252	$self->{user_w} = $w;	316	$self->{def_w} = $w;
253	$self->{user_h} = $h;	317	$self->{def_h} = $h;
254		318
255	$self->check_size;	319	$self->check_size;
256	}	320	}
257		321
258	sub size_request {	322	sub size_request {
…		…
308	}	372	}
309		373
310	sub set_tooltip {	374	sub set_tooltip {
311	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
312		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
		381
313	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
314		383
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
317	CFClient::UI::check_tooltip;	386	CFClient::UI::check_tooltip;
…		…
338	return if $FOCUS == $self;	407	return if $FOCUS == $self;
339	return unless $self->{can_focus};	408	return unless $self->{can_focus};
340		409
341	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
342		411
343	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
344		413
345	$focus->update if $focus;	414	$focus->update if $focus;
346	$FOCUS->update;	415	$FOCUS->update;
347	}	416	}
348		417
…		…
351		420
352	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
353		422
354	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
355		424
356	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
357		426
358	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
359	}	431	}
360		432
361	sub mouse_motion { }	433	sub mouse_motion { }
362	sub button_up { }	434	sub button_up { }
363	sub key_down { }	435	sub key_down { }
364	sub key_up { }	436	sub key_up { }
365		437
366	sub button_down {	438	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
368		440
369	$self->focus_in;	441	$self->focus_in;
…		…
403	if ($ENV{PCLIENT_DEBUG}) {	475	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;	476	glPushMatrix;
405	glColor 1, 1, 0, 1;	477	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	479	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	480	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	481	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	482	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	483	glVertex 0 , $self->{h} - 1;
412	glEnd;	484	glEnd;
413	glPopMatrix;	485	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	486	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	487	}
416	}	488	}
…		…
436	sub set_parent {	508	sub set_parent {
437	my ($self, $parent) = @_;	509	my ($self, $parent) = @_;
438		510
439	Scalar::Util::weaken ($self->{parent} = $parent);	511	Scalar::Util::weaken ($self->{parent} = $parent);
440		512
441	# TODO: req_w _does_change after ->reconfigure	513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		514
442	$self->check_size	515	$self->check_size;
443	unless exists $self->{req_w};
444
445	$self->show;
446	}	516	}
447		517
448	sub check_size {	518	sub check_size {
449	my ($self, $forced) = @_;	519	my ($self, $forced) = @_;
450		520
…		…
463	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
464		534
465	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}	536	}
467		537
		538	sub _emit {
		539	my ($self, $signal, @args) = @_;
		540
		541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		542	}
		543
468	sub emit {	544	sub emit {
469	my ($self, $signal, @args) = @_;	545	my ($self, $signal, @args) = @_;
470		546
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	547	$self->_emit ($signal, @args)
		548	|| $self->$signal (@args);
		549	}
		550
		551	sub visibility_change {
		552	#my ($self, $visible) = @_;
472	}	553	}
473		554
474	sub DESTROY {	555	sub DESTROY {
475	my ($self) = @_;	556	my ($self) = @_;
476		557
…		…
589	delete $child->{parent};	670	delete $child->{parent};
590	$child->hide;	671	$child->hide;
591		672
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		674
594	$self->check_size;	675	$self->check_size (1);
595	$self->update;	676	$self->update;
596	}	677	}
597		678
598	sub clear {	679	sub clear {
599	my ($self) = @_;	680	my ($self) = @_;
…		…
739		820
740	package CFClient::UI::ViewPort;	821	package CFClient::UI::ViewPort;
741		822
742	our @ISA = CFClient::UI::Window::;	823	our @ISA = CFClient::UI::Window::;
743		824
		825	sub new {
		826	my $class = shift;
		827
		828	$class->SUPER::new (
		829	scroll_x => 0,
		830	scroll_y => 1,
		831	@_,
		832	)
		833	}
		834
744	sub size_request {	835	sub size_request {
745	my ($self) = @_;	836	my ($self) = @_;
746		837
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	838	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
749		839
750	@$self{qw(child_w child_h)}	840	$w = 10 if $self->{scroll_x};
		841	$h = 10 if $self->{scroll_y};
		842
		843	($w, $h)
751	}	844	}
752		845
753	sub size_allocate {	846	sub size_allocate {
754	my ($self, $w, $h) = @_;	847	my ($self, $w, $h) = @_;
755		848
		849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		851
		852	$self->child->configure (0, 0, $w, $h);
756	$self->update;	853	$self->update;
757	}	854	}
758		855
759	sub set_offset {	856	sub set_offset {
760	my ($self, $x, $y) = @_;	857	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	908	my $class = shift;
812		909
813	my $self;	910	my $self;
814		911
815	my $slider = new CFClient::UI::Slider	912	my $slider = new CFClient::UI::Slider
816	vertical => 1,	913	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	914	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	915	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	916	$self->{vp}->set_offset (0, $_[1]);
820	},	917	},
821	;	918	;
822		919
823	$self = $class->SUPER::new (	920	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	921	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	926	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	927	$self->add ($self->{vp});
831	$self->add ($self->{slider});	928	$self->add ($self->{slider});
832		929
833	$self	930	$self
		931	}
		932
		933	sub update {
		934	my ($self) = @_;
		935
		936	$self->SUPER::update;
		937
		938	# todo: overwrite size_allocate of child
		939	my $child = $self->{vp}->child;
		940	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		941	}
		942
		943	sub size_allocate {
		944	my ($self, $w, $h) = @_;
		945
		946	$self->SUPER::size_allocate ($w, $h);
		947
		948	my $child = $self->{vp}->child;
		949	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834	}	950	}
835		951
836	#TODO# update range on size_allocate depending on child	952	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	953	# update viewport offset on scroll
838		954
…		…
889	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890		1006
891	sub new {	1007	sub new {
892	my $class = shift;	1008	my $class = shift;
893		1009
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1010	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1011	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1012	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1013	border => 0.6,
900	toplevel => 1,	1014	is_toplevel => 1,
901	can_events => 1,	1015	can_events => 1,
902	@_	1016	@_
903	);	1017	);
904		1018
905	$self->{title} &&= new CFClient::UI::Label	1019	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1020	align => 0,
…		…
959	my ($ev, $x, $y) = @_;	1073	my ($ev, $x, $y) = @_;
960		1074
961	my $dx = $ev->{x} - $ox;	1075	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1076	my $dy = $ev->{y} - $oy;
963		1077
		1078	$self->{user_x} = $wx + $dx * $mx;
		1079	$self->{user_y} = $wy + $dy * $my;
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1082	$self->move ($self->{user_x}, $self->{user_y});
967	$self->check_size;	1083	$self->check_size;
968	};	1084	};
969		1085
970	} elsif ($lr ^ $td) {	1086	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
974	$self->{motion} = sub {	1090	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
976		1092
977	($x, $y) = ($ev->{x}, $ev->{y});	1093	($x, $y) = ($ev->{x}, $ev->{y});
978		1094
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1095	$self->{user_x} = $bx + $x - $ox;
		1096	$self->{user_y} = $by + $y - $oy;
		1097
		1098	$self->move ($self->{user_x}, $self->{user_y});
980	$self->update;	1099	$self->update;
981	};	1100	};
982	}	1101	}
983	}	1102	}
984		1103
…		…
1046	sub new {	1165	sub new {
1047	my $class = shift;	1166	my $class = shift;
1048		1167
1049	$class->SUPER::new (	1168	$class->SUPER::new (
1050	col_expand => [],	1169	col_expand => [],
1051	@_	1170	@_,
1052	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1176	}
1054		1177
1055	sub add {	1178	sub add {
1056	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1057		1180
1058	$child->set_parent ($self);	1181	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1060		1183
1061	$child->check_size;	1184	$self->check_size (1);
1062	}	1185	}
1063		1186
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1069	sub clear {	1188	sub clear {
1070	my ($self) = @_;	1189	my ($self) = @_;
1071		1190
1072	my @children = $self->children;	1191	my @children = $self->children;
1073	delete $self->{children};	1192	delete $self->{children};
…		…
1075	for (@children) {	1194	for (@children) {
1076	delete $_->{parent};	1195	delete $_->{parent};
1077	$_->hide;	1196	$_->hide;
1078	}	1197	}
1079		1198
		1199	$self->check_size (1);
1080	$self->update;	1200	$self->update;
1081	}	1201	}
1082		1202
1083	sub get_wh {	1203	sub get_wh {
1084	my ($self) = @_;	1204	my ($self) = @_;
…		…
1116	sub size_allocate {	1236	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1118		1238
1119	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1120		1240
1121	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1123		1243
1124	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1301	}
1182	}	1302	}
1183		1303
1184	#############################################################################	1304	#############################################################################
1185		1305
1186	package CFClient::UI::HBox;	1306	package CFClient::UI::Box;
1187
1188	# TODO: wrap into common Box base class
1189		1307
1190	our @ISA = CFClient::UI::Container::;	1308	our @ISA = CFClient::UI::Container::;
1191		1309
1192	sub size_request {	1310	sub size_request {
1193	my ($self) = @_;	1311	my ($self) = @_;
1194		1312
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1313	$self->{vertical}
1196		1314	? (
1197	(	1315	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1198	(List::Util::sum map $_->[0], @alloc),	1316	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199	(List::Util::max map $_->[1], @alloc),	1317	)
1200	)	1318	: (
		1319	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1320	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1321	)
1201	}	1322	}
1202		1323
1203	sub size_allocate {	1324	sub size_allocate {
1204	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1205		1326
1206	($h, $w) = ($w, $h);	1327	my $space = $self->{vertical} ? $h : $w;
1207
1208	my $children = $self->{children};	1328	my $children = $self->{children};
1209		1329
1210	my @h = map $_->{req_w}, @$children;	1330	my @req;
1211		1331
1212	my $req_h = List::Util::sum @h;	1332	if ($self->{homogeneous}) {
1213		1333	@req = ($space / (@$children || 1)) x @$children;
1214	if ($req_h > $h) {
1215	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;
1217	} else {	1334	} else {
		1335	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1336	my $req = List::Util::sum @req;
		1337
		1338	if ($req > $space) {
		1339	# ah well, not enough space
		1340	$_ *= $space / $req for @req;
		1341	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;	1342	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219	$exp ||= 1;
1220		1343
		1344	$space = ($space - $req) / $expand; # remaining space to give away
		1345
		1346	$req[$_] += $space * $children->[$_]{expand}
1221	for (0 .. $#$children) {	1347	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	}	1348	}
1228	}	1349	}
1229		1350
1230	CFClient::UI::harmonize \@h;	1351	CFClient::UI::harmonize \@req;
1231		1352
1232	my $y = 0;	1353	my $pos = 0;
1233	for (0 .. $#$children) {	1354	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];	1355	my $alloc = $req[$_];
1236	$child->configure ($y, 0, $h, $w);	1356	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237		1357
1238	$y += $h;	1358	$pos += $alloc;
1239	}	1359	}
1240		1360
1241	1	1361	1
1242	}	1362	}
1243		1363
1244	#############################################################################	1364	#############################################################################
1245		1365
		1366	package CFClient::UI::HBox;
		1367
		1368	our @ISA = CFClient::UI::Box::;
		1369
		1370	sub new {
		1371	my $class = shift;
		1372
		1373	$class->SUPER::new (
		1374	vertical => 0,
		1375	@_,
		1376	)
		1377	}
		1378
		1379	#############################################################################
		1380
1246	package CFClient::UI::VBox;	1381	package CFClient::UI::VBox;
1247		1382
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Box::;
1251		1384
1252	sub size_request {	1385	sub new {
1253	my ($self) = @_;	1386	my $class = shift;
1254		1387
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$class->SUPER::new (
1256		1389	vertical => 1,
1257	(	1390	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1391	)
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	}	1392	}
1301		1393
1302	#############################################################################	1394	#############################################################################
1303		1395
1304	package CFClient::UI::Label;	1396	package CFClient::UI::Label;
…		…
1488	active_fg => [0, 0, 0],	1580	active_fg => [0, 0, 0],
1489	can_hover => 1,	1581	can_hover => 1,
1490	can_focus => 1,	1582	can_focus => 1,
1491	valign => 0,	1583	valign => 0,
1492	can_events => 1,	1584	can_events => 1,
		1585	#text => ...
1493	@_	1586	@_
1494	)	1587	)
1495	}	1588	}
1496		1589
1497	sub _set_text {	1590	sub _set_text {
…		…
1507	$self->{text} = $text;	1600	$self->{text} = $text;
1508		1601
1509	$text =~ s/./*/g if $self->{hidden};	1602	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1603	$self->{layout}->set_text ("$text ");
1511		1604
1512	$self->emit (changed => $self->{text});	1605	$self->_emit (changed => $self->{text});
1513	}	1606	}
1514		1607
1515	sub set_text {	1608	sub set_text {
1516	my ($self, $text) = @_;	1609	my ($self, $text) = @_;
1517		1610
…		…
1529	my ($self) = @_;	1622	my ($self) = @_;
1530		1623
1531	my ($w, $h) = $self->SUPER::size_request;	1624	my ($w, $h) = $self->SUPER::size_request;
1532		1625
1533	($w + 1, $h) # add 1 for cursor	1626	($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	}	1627	}
1541		1628
1542	sub key_down {	1629	sub key_down {
1543	my ($self, $ev) = @_;	1630	my ($self, $ev) = @_;
1544		1631
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1646	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1647	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1648	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1649	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1650	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1651	$self->_emit ('escape');
1565	} elsif ($uni) {	1652	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1653	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1654	}
1568		1655
1569	$self->_set_text ($text);	1656	$self->_set_text ($text);
…		…
1656	if ($sym == 13) {	1743	if ($sym == 13) {
1657	unshift @{$self->{history}},	1744	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1745	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1746	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1747	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1748	$self->_emit (activate => $txt);
1662	$self->update;	1749	$self->update;
1663		1750
1664	} elsif ($sym == CFClient::SDLK_UP) {	1751	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1752	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1753	$self->{history_saveback} = $self->get_text;
…		…
1714	can_events => 1,	1801	can_events => 1,
1715	@_	1802	@_
1716	)	1803	)
1717	}	1804	}
1718		1805
		1806	sub activate { }
		1807
1719	sub button_up {	1808	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1809	my ($self, $ev, $x, $y) = @_;
1721		1810
		1811	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1812	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1813	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1814	}
1727		1815
1728	sub _draw {	1816	sub _draw {
1729	my ($self) = @_;	1817	my ($self) = @_;
1730		1818
…		…
1782	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1783		1871
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786	$self->{state} = !$self->{state};	1874	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1875	$self->_emit (changed => $self->{state});
1788	}	1876	}
1789	}	1877	}
1790		1878
1791	sub _draw {	1879	sub _draw {
1792	my ($self) = @_;	1880	my ($self) = @_;
…		…
2067	my $self = $class->SUPER::new (	2155	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2156	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2157	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2158	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2159	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2160	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2161	req_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2162	req_h => $::WIDTH / 80,
2075	vertical => 0,	2163	vertical => 0,
2076	can_hover => 1,	2164	can_hover => 1,
2077	inner_pad => 0.02,	2165	inner_pad => 0.02,
…		…
2082	$self->update;	2170	$self->update;
2083		2171
2084	$self	2172	$self
2085	}	2173	}
2086		2174
		2175	sub set_range {
		2176	my ($self, $range) = @_;
		2177
		2178	($range, $self->{range}) = ($self->{range}, $range);
		2179
		2180	$self->update
		2181	if "@$range" ne "@{$self->{range}}";
		2182	}
		2183
2087	sub set_value {	2184	sub set_value {
2088	my ($self, $value) = @_;	2185	my ($self, $value) = @_;
2089		2186
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2187	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2188
2092	$hi = $lo + 1 if $hi <= $lo;	2189	$hi = $lo + 1 if $hi <= $lo;
2093		2190
		2191	$page = $hi - $lo if $page > $hi - $lo;
		2192
2094	$value = $lo if $value < $lo;	2193	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2194	$value = $hi - $page if $value > $hi - $page;
2096		2195
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2196	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2197	if $unit;
2099		2198
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2199	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2200
2104	if ($value != $old_value) {	2201	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2202	$self->_emit (changed => $value);
2106	$self->update;	2203	$self->update;
2107	}	2204	}
2108	}	2205	}
2109		2206
2110	sub size_request {	2207	sub size_request {
…		…
2118		2215
2119	sub button_down {	2216	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2217	my ($self, $ev, $x, $y) = @_;
2121		2218
2122	$self->SUPER::button_down ($ev, $x, $y);	2219	$self->SUPER::button_down ($ev, $x, $y);
		2220
		2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2222
2123	$self->mouse_motion ($ev, $x, $y);	2223	$self->mouse_motion ($ev, $x, $y);
2124	}	2224	}
2125		2225
2126	sub mouse_motion {	2226	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2229	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2230	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2231
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2232	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2233
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2235
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2236	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2237	}
2138	}	2238	}
2139		2239
2140	sub update {	2240	sub update {
2141	my ($self) = @_;	2241	my ($self) = @_;
2142		2242
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2243	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2244	$self->set_value ($self->{range}[0]);
2145		2245
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2246	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2247	my $range = ($hi - $page - $lo) || 1e-100;
2147		2248
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2249	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2250
2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2251	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2252	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151		2253
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2254	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2255	$value = $value * $self->{scale} + $self->{offset};
2154		2256
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;	2257	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2258	$self->{knob_w} = $knob_w;
2162	});	2259	});
2163		2260
2164	$self->SUPER::update;	2261	$self->SUPER::update;
2165	}	2262	}
2166		2263
…		…
2190	# draw handle	2287	# draw handle
2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2288	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192		2289
2193	glDisable GL_TEXTURE_2D;	2290	glDisable GL_TEXTURE_2D;
2194	}	2291	}
		2292
		2293	#############################################################################
		2294
		2295	package CFClient::UI::ValSlider;
		2296
		2297	our @ISA = CFClient::UI::HBox::;
		2298
		2299	sub new {
		2300	my ($class, %arg) = @_;
		2301
		2302	my $range = delete $arg{range};
		2303
		2304	my $self = $class->SUPER::new (
		2305	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2306	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2307	to_value => sub { shift },
		2308	from_value => sub { shift },
		2309	%arg,
		2310	);
		2311
		2312	$self->{slider}->connect (changed => sub {
		2313	my ($self, $value) = @_;
		2314	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2315	$self->{parent}->emit (changed => $value);
		2316	});
		2317
		2318	# $self->{entry}->connect (changed => sub {
		2319	# my ($self, $value) = @_;
		2320	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2321	# $self->{parent}->emit (changed => $value);
		2322	# });
		2323
		2324	$self->add ($self->{slider}, $self->{entry});
		2325
		2326	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2327
		2328	$self
		2329	}
		2330
		2331	sub set_range { shift->{slider}->set_range (@_) }
		2332	sub set_value { shift->{slider}->set_value (@_) }
2195		2333
2196	#############################################################################	2334	#############################################################################
2197		2335
2198	package CFClient::UI::TextView;	2336	package CFClient::UI::TextView;
2199		2337
…		…
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2379	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2380
2243	$self->reflow;	2381	$self->reflow;
2244	}	2382	}
2245		2383
2246	sub text_height {	2384	sub text_size {
2247	my ($self, $text, $indent) = @_;	2385	my ($self, $text, $indent) = @_;
2248		2386
2249	my $layout = $self->{layout};	2387	my $layout = $self->{layout};
2250		2388
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2390	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2391	$layout->set_markup ($text);
2254		2392
2255	($layout->size)[1]	2393	$layout->size
2256	}	2394	}
2257		2395
2258	sub reflow {	2396	sub reflow {
2259	my ($self) = @_;	2397	my ($self) = @_;
2260		2398
2261	$self->{need_reflow}++;	2399	$self->{need_reflow}++;
2262	$self->update;	2400	$self->update;
2263	}	2401	}
2264		2402
		2403	sub set_offset {
		2404	my ($self, $offset) = @_;
		2405
		2406	# todo: base offset on lines or so, not on pixels
		2407	$self->{children}[1]->set_value ($offset);
		2408	}
		2409
		2410	sub clear {
		2411	my ($self) = @_;
		2412
		2413	$self->{par} = [];
		2414	$self->{height} = 0;
		2415	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2416	}
		2417
2265	sub add_paragraph {	2418	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2419	my ($self, $color, $text, $indent) = @_;
2267		2420
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2421	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2422	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2423	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2424	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2425	}
2275		2426
2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2427	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277	$self->{children}[1]->update;
2278	}	2428	}
2279		2429
2280	sub update {	2430	sub update {
2281	my ($self) = @_;	2431	my ($self) = @_;
2282		2432
…		…
2285	return unless $self->{h} > 0;	2435	return unless $self->{h} > 0;
2286		2436
2287	delete $self->{texture};	2437	delete $self->{texture};
2288		2438
2289	$ROOT->on_post_alloc ($self, sub {	2439	$ROOT->on_post_alloc ($self, sub {
		2440	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2441
2290	if (delete $self->{need_reflow}) {	2442	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2443	my $height = 0;
2292		2444
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2445	my $layout = $self->{layout};
		2446
		2447	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2448
2294	for @{$self->{par}};	2449	for (@{$self->{par}}) {
		2450	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2451	$layout->set_width ($W - $_->[3]);
		2452	$layout->set_markup ($_->[4]);
		2453	my ($w, $h) = $layout->size;
		2454	$_->[0] = $w + $_->[3];
		2455	$_->[1] = $h;
		2456	}
		2457
		2458	$height += $_->[1];
		2459	}
2295		2460
2296	$self->{height} = $height;	2461	$self->{height} = $height;
2297		2462
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2463	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2464
2301	delete $self->{texture};	2465	delete $self->{texture};
2302	}	2466	}
2303		2467
2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2468	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2469	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2470	glClear GL_COLOR_BUFFER_BIT;
2307		2471
2308	my $top = int $self->{children}[1]{range}[0];	2472	my $top = int $self->{children}[1]{range}[0];
2309		2473
2310	my $y0 = $top;	2474	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2475	my $y1 = $top + $H;
2312		2476
2313	my $y = 0;	2477	my $y = 0;
2314		2478
2315	my $layout = $self->{layout};	2479	my $layout = $self->{layout};
2316		2480
2317	$layout->set_font ($self->{font}) if $self->{font};	2481	$layout->set_font ($self->{font}) if $self->{font};
2318		2482
2319	glEnable GL_BLEND;	2483	glEnable GL_BLEND;
		2484	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2485	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2486
2322	for my $par (@{$self->{par}}) {	2487	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2488	my $h = $par->[1];
2324		2489
2325	if ($y0 < $y + $h && $y < $y1) {	2490	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2491	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2492	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2493	$layout->set_markup ($par->[4]);
2329		2494
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2495	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2496
2332	glRasterPos $par->[2], $y - $y0;	2497	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2498	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2499	}
2335		2500
2336	$y += $h;	2501	$y += $h;
2337	}	2502	}
…		…
2404		2569
2405	sub new {	2570	sub new {
2406	my $class = shift;	2571	my $class = shift;
2407		2572
2408	my $self = $class->SUPER::new (	2573	my $self = $class->SUPER::new (
2409	state => 0,	2574	state => 0,
2410	connect_activate => \&toggle_flopper,	2575	on_activate => \&toggle_flopper,
2411	@_	2576	@_
2412	);	2577	);
2413		2578
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2579	$self
2420	}	2580	}
2421		2581
2422	sub toggle_flopper {	2582	sub toggle_flopper {
2423	my ($self) = @_;	2583	my ($self) = @_;
2424		2584
2425	# TODO: use animation	2585	$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	}	2586	}
2437		2587
2438	#############################################################################	2588	#############################################################################
2439		2589
2440	package CFClient::UI::Tooltip;	2590	package CFClient::UI::Tooltip;
…		…
2516		2666
2517	sub new {	2667	sub new {
2518	my $class = shift;	2668	my $class = shift;
2519		2669
2520	my $self = $class->SUPER::new (	2670	my $self = $class->SUPER::new (
2521	aspect => 1,	2671	aspect => 1,
		2672	can_events => 0,
2522	@_,	2673	@_,
2523	);	2674	);
2524		2675
2525	if ($self->{anim} && $self->{animspeed}) {	2676	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2677	Scalar::Util::weaken (my $widget = $self);
…		…
2552	}	2703	}
2553		2704
2554	sub _draw {	2705	sub _draw {
2555	my ($self) = @_;	2706	my ($self) = @_;
2556		2707
2557	return unless $::CONN;#d# manage and cache textures differently	2708	return unless $::CONN;
2558		2709
2559	my $face;	2710	my $face;
2560		2711
2561	if ($self->{frame}) {	2712	if ($self->{frame}) {
2562	my $anim = $::CONN->{anim}[$self->{anim}];	2713	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2585	$self->SUPER::DESTROY;	2736	$self->SUPER::DESTROY;
2586	}	2737	}
2587		2738
2588	#############################################################################	2739	#############################################################################
2589		2740
2590	package CFClient::UI::InventoryItem;	2741	package CFClient::UI::Inventory;
2591		2742
2592	our @ISA = CFClient::UI::HBox::;	2743	our @ISA = CFClient::UI::ScrolledWindow::;
2593
2594	sub _item_to_desc {
2595	my ($item) = @_;
2596
2597	my $desc =
2598	$item->{nrof} < 2
2599	? $item->{name}
2600	: "$item->{nrof} × $item->{name_pl}";
2601
2602	$item->{flags} & Crossfire::Protocol::F_OPEN
2603	and $desc .= " (open)";
2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
2605	and $desc .= " (applied)";
2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
2607	and $desc .= " (unpaid)";
2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
2609	and $desc .= " (magic)";
2610	$item->{flags} & Crossfire::Protocol::F_CURSED
2611	and $desc .= " (cursed)";
2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
2613	and $desc .= " (damned)";
2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
2615	and $desc .= " *";
2616
2617	$desc
2618	}
2619		2744
2620	sub new {	2745	sub new {
2621	my $class = shift;	2746	my $class = shift;
2622		2747
2623	my %args = @_;
2624
2625	my $item = delete $args{item};
2626
2627	my $desc = _item_to_desc ($item);
2628
2629	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
2630	can_hover => 1,
2631	can_events => 1,
2632	tooltip => ((CFClient::UI::Label::escape $desc)
2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634	connect_button_down => sub {
2635	my ($self, $ev, $x, $y) = @_;
2636
2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639	my $targ = $::CONN->{player}{tag};
2640
2641	if ($item->{container} == $::CONN->{player}{tag}) {
2642	$targ = $main::OPENCONT;
2643	}
2644
2645	$::CONN->send ("move $targ $item->{tag} 0");
2646	} elsif ($ev->{button} == 1) {
2647	$::CONN->send ("examine $item->{tag}");
2648	} elsif ($ev->{button} == 2) {
2649	$::CONN->send ("apply $item->{tag}");
2650	} elsif ($ev->{button} == 3) {
2651	my @menu_items = (
2652	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655	(
2656	$item->{flags} & Crossfire::Protocol::F_LOCKED
2657	? (
2658	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659	)
2660	: (
2661	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663	)
2664	),
2665	);
2666
2667	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668	}
2669
2670	1
2671	},
2672	%args
2673	);
2674
2675
2676	$self->add (new CFClient::UI::Face
2677	can_events => 0,
2678	face => $item->{face},
2679	anim => $item->{anim},
2680	animspeed => $item->{animspeed},
2681	);
2682
2683	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685	$self->{item} = $item;
2686
2687	$self->update_item;
2688
2689	$self
2690	}
2691
2692	sub update_item {
2693	my ($self) = @_;
2694
2695	my $desc = _item_to_desc ($self->{item});
2696
2697	$self->{name_lbl}->set_text ($desc);
2698	}
2699
2700	#############################################################################
2701
2702	package CFClient::UI::Inventory;
2703
2704	our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706	sub new {
2707	my $class = shift;
2708
2709	my $self = $class->SUPER::new (
2710	scrolled => (new CFClient::UI::Table),	2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2711	@_,	2750	@_,
2712	);	2751	);
2713		2752
2714	$self	2753	$self
2715	}	2754	}
…		…
2725	or ($a->{name} cmp $b->{name})	2764	or ($a->{name} cmp $b->{name})
2726	} @$items;	2765	} @$items;
2727		2766
2728	$self->{real_items} = \@items;	2767	$self->{real_items} = \@items;
2729		2768
		2769	my $row = 0;
2730	for my $item (@items) {	2770	for my $item (@items) {
2731	$item->{item} = $item;	2771	CFClient::Item::update_widgets $item;
2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733	$item->update_item ();
2734	}
2735		2772
2736	my $i = 0;	2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2737	for (@items) {	2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2738	$self->{scrolled}->add (0, $i, $_);	2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2739	my $nrof = $_->{item}->{nrof} || 1;
2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741	}
2742		2776
2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2777	$row++;
2744	}	2778	}
2745
2746	sub size_request {
2747	my ($self) = @_;
2748	($self->{req_w}, $self->{req_h});
2749	}	2779	}
2750		2780
2751	#############################################################################	2781	#############################################################################
2752		2782
2753	package CFClient::UI::Menu;	2783	package CFClient::UI::Menu;
…		…
2788		2818
2789	# popup given the event (must be a mouse button down event currently)	2819	# popup given the event (must be a mouse button down event currently)
2790	sub popup {	2820	sub popup {
2791	my ($self, $ev) = @_;	2821	my ($self, $ev) = @_;
2792		2822
2793	$self->emit ("popdown");	2823	$self->_emit ("popdown");
2794		2824
2795	# maybe save $GRAB? must be careful about events...	2825	# maybe save $GRAB? must be careful about events...
2796	$GRAB = $self;	2826	$GRAB = $self;
2797	$self->{button} = $ev->{button};	2827	$self->{button} = $ev->{button};
2798		2828
…		…
2813		2843
2814	if ($ev->{button} == $self->{button}) {	2844	if ($ev->{button} == $self->{button}) {
2815	undef $GRAB;	2845	undef $GRAB;
2816	$self->hide;	2846	$self->hide;
2817		2847
2818	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2819	$self->{hover}[1]->() if $self->{hover};	2849	$self->{hover}[1]->() if $self->{hover};
2820	}	2850	}
2821	}	2851	}
2822		2852
2823	#############################################################################	2853	#############################################################################
…		…
2885	sub add {	2915	sub add {
2886	my ($self, $text, %arg) = @_;	2916	my ($self, $text, %arg) = @_;
2887		2917
2888	$text =~ s/^\s+//;	2918	$text =~ s/^\s+//;
2889	$text =~ s/\s+$//;	2919	$text =~ s/\s+$//;
		2920
		2921	return unless $text;
2890		2922
2891	my $timeout = time + ((delete $arg{timeout}) || 60);	2923	my $timeout = time + ((delete $arg{timeout}) || 60);
2892		2924
2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2925	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894		2926
…		…
2938		2970
2939	sub new {	2971	sub new {
2940	my $class = shift;	2972	my $class = shift;
2941		2973
2942	$class->SUPER::new (	2974	$class->SUPER::new (
		2975	visible => 1,
2943	@_,	2976	@_,
2944	)	2977	)
2945	}	2978	}
2946		2979
2947	sub configure {	2980	sub configure {
…		…
2965	}	2998	}
2966		2999
2967	sub size_allocate {	3000	sub size_allocate {
2968	my ($self, $w, $h) = @_;	3001	my ($self, $w, $h) = @_;
2969		3002
2970	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976	for my $child ($self->children) {	3003	for my $child ($self->children) {
2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978		3005
2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980	if exists $child->{req_x};	3007	if exists $child->{req_x};
2981		3008
2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983	if exists $child->{req_y};	3010	if exists $child->{req_y};
2984		3011
		3012	delete @$child{qw(req_x req_y)};
		3013
2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987		3016
2988	$child->configure ($X, $Y, $W, $H);	3017	$child->configure ($X, $Y, $W, $H);
2989	}	3018	}
…		…
3010		3039
3011	sub add {	3040	sub add {
3012	my ($self, @children) = @_;	3041	my ($self, @children) = @_;
3013		3042
3014	for my $child (@children) {	3043	for my $child (@children) {
3015	$child->{toplevel} = 1;	3044	$child->{is_toplevel} = 1;
3016		3045
3017	# integerise window positions	3046	# integerise window positions
3018	$child->{x} = int $child->{x};	3047	$child->{x} = int $child->{x};
3019	$child->{y} = int $child->{y};	3048	$child->{y} = int $child->{y};
3020	}	3049	}
3021		3050
3022	$self->SUPER::add (@children);	3051	$self->SUPER::add (@children);
3023		3052
		3053	for (my @widgets = @children; my $w = pop @widgets; ) {
		3054	push @widgets, $w->children;
		3055	$w->set_visible;
		3056	}
		3057
		3058	}
		3059
		3060	sub remove {
		3061	my ($self, @children) = @_;
		3062
		3063	$self->SUPER::remove (@children);
		3064
3024	while (@children) {	3065	while (@children) {
3025	my $w = pop @children;	3066	my $w = pop @children;
3026	push @children, $w->children;	3067	push @children, $w->children;
3027	$w->{visible} = 1;	3068	$w->set_invisible;
3028	}
3029	}
3030
3031	sub remove {
3032	my ($self, @children) = @_;
3033
3034	$self->SUPER::remove (@children);
3035
3036	while (@children) {
3037	my $w = pop @children;
3038	push @children, $w->children;
3039	delete $w->{visible};
3040	}	3069	}
3041	}	3070	}
3042		3071
3043	sub on_refresh {	3072	sub on_refresh {
3044	my ($self, $id, $cb) = @_;	3073	my ($self, $id, $cb) = @_;
…		…
3059	$_->()	3088	$_->()
3060	for values %{delete $self->{refresh_hook}};	3089	for values %{delete $self->{refresh_hook}};
3061	}	3090	}
3062		3091
3063	if ($self->{check_size}) {	3092	if ($self->{check_size}) {
3064	my @queue = ([], []);	3093	my @queue;
3065		3094
3066	for (;;) {	3095	for (;;) {
3067	if ($self->{check_size}) {	3096	if ($self->{check_size}) {
3068	# heuristic: check containers last	3097	#TODO use array-of-depth approach
3069	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3098
		3099	@queue = sort { $a->{visible} <=> $b->{visible} }
3070	for values %{delete $self->{check_size}}	3100	@queue, values %{delete $self->{check_size}};
3071	}	3101	}
3072		3102
3073	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3103	my $widget = pop @queue || last;
3074		3104
		3105	defined $widget->{visible} or last; # do not resize invisible widgets
		3106
3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3076	? @$widget{qw(user_w user_h)}	3108	? @$widget{qw(def_w def_h)}
3077	: $widget->size_request;	3109	: $widget->size_request;
3078		3110
3079	if (delete $widget->{force_alloc}	3111	if (delete $widget->{force_alloc}
3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3098	$w = 0 if $w < 0;	3130	$w = 0 if $w < 0;
3099	$h = 0 if $h < 0;	3131	$h = 0 if $h < 0;
3100		3132
3101	$widget->{w} = $w;	3133	$widget->{w} = $w;
3102	$widget->{h} = $h;	3134	$widget->{h} = $h;
3103	$widget->size_allocate ($w, $h);
3104	$widget->emit (size_allocate => $w, $h);	3135	$widget->emit (size_allocate => $w, $h);
3105	}	3136	}
3106	}	3137	}
3107		3138
3108	while ($self->{post_alloc_hook}) {	3139	while ($self->{post_alloc_hook}) {

Diff Legend

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