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.249 by root, Sun May 28 01:40:02 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) = @_;
		245
211	return if $self->{parent};	246	return if $self->{parent};
212		247
213	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
214	}	249	}
215		250
216	sub show_centered {	251	sub center {
217	my ($self) = @_;	252	my ($self) = @_;
218	return if $self->{parent};
219
220	$self->show;
221		253
222	$CFClient::UI::ROOT->on_post_alloc (	254	$CFClient::UI::ROOT->on_post_alloc (
223	"centered $self" => sub {	255	"center_$self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225	},	257	},
226	);	258	);
227	}
228		259
229	sub hide {	260	$self->update;
		261	}
		262
		263	sub set_visible {
230	my ($self) = @_;	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; #TODO why breakssssss borked damn if $parent->{visible};
		515
442	$self->check_size	516	$self->check_size;
443	unless exists $self->{req_w};
444
445	$self->show;
446	}	517	}
447		518
448	sub check_size {	519	sub check_size {
449	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
450		521
…		…
463	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
464		535
465	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}	537	}
467		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
468	sub emit {	545	sub emit {
469	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
470		547
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	548	$self->_emit ($signal, @args)
		549	|| $self->$signal (@args);
		550	}
		551
		552	sub visibility_change {
		553	#my ($self, $visible) = @_;
472	}	554	}
473		555
474	sub DESTROY {	556	sub DESTROY {
475	my ($self) = @_;	557	my ($self) = @_;
476		558
…		…
589	delete $child->{parent};	671	delete $child->{parent};
590	$child->hide;	672	$child->hide;
591		673
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		675
594	$self->check_size;	676	$self->check_size (1);
595	$self->update;	677	$self->update;
596	}	678	}
597		679
598	sub clear {	680	sub clear {
599	my ($self) = @_;	681	my ($self) = @_;
…		…
739		821
740	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
741		823
742	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
743		825
		826	sub new {
		827	my $class = shift;
		828
		829	$class->SUPER::new (
		830	scroll_x => 0,
		831	scroll_y => 1,
		832	@_,
		833	)
		834	}
		835
744	sub size_request {	836	sub size_request {
745	my ($self) = @_;	837	my ($self) = @_;
746		838
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	839	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		840
750	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
751	}	845	}
752		846
753	sub size_allocate {	847	sub size_allocate {
754	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
755		849
		850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		852
		853	$self->child->configure (0, 0, $w, $h);
756	$self->update;	854	$self->update;
757	}	855	}
758		856
759	sub set_offset {	857	sub set_offset {
760	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	909	my $class = shift;
812		910
813	my $self;	911	my $self;
814		912
815	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
816	vertical => 1,	914	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	916	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
820	},	918	},
821	;	919	;
822		920
823	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	922	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	928	$self->add ($self->{vp});
831	$self->add ($self->{slider});	929	$self->add ($self->{slider});
832		930
833	$self	931	$self
		932	}
		933
		934	sub update {
		935	my ($self) = @_;
		936
		937	$self->SUPER::update;
		938
		939	# todo: overwrite size_allocate of child
		940	my $child = $self->{vp}->child;
		941	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		942	}
		943
		944	sub size_allocate {
		945	my ($self, $w, $h) = @_;
		946
		947	$self->SUPER::size_allocate ($w, $h);
		948
		949	my $child = $self->{vp}->child;
		950	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834	}	951	}
835		952
836	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	954	# update viewport offset on scroll
838		955
…		…
889	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890		1007
891	sub new {	1008	sub new {
892	my $class = shift;	1009	my $class = shift;
893		1010
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1014	border => 0.6,
900	toplevel => 1,	1015	is_toplevel => 1,
901	can_events => 1,	1016	can_events => 1,
902	@_	1017	@_
903	);	1018	);
904		1019
905	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1021	align => 0,
…		…
959	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
960		1075
961	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
963		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
967	$self->check_size;	1084	$self->check_size;
968	};	1085	};
969		1086
970	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
974	$self->{motion} = sub {	1091	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
976		1093
977	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
978		1095
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098
		1099	$self->move ($self->{user_x}, $self->{user_y});
980	$self->update;	1100	$self->update;
981	};	1101	};
982	}	1102	}
983	}	1103	}
984		1104
…		…
1046	sub new {	1166	sub new {
1047	my $class = shift;	1167	my $class = shift;
1048		1168
1049	$class->SUPER::new (	1169	$class->SUPER::new (
1050	col_expand => [],	1170	col_expand => [],
1051	@_	1171	@_,
1052	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1177	}
1054		1178
1055	sub add {	1179	sub add {
1056	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1057		1181
1058	$child->set_parent ($self);	1182	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1060		1184
1061	$child->check_size;	1185	$self->check_size (1);
1062	}	1186	}
1063		1187
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# TODO: move to container class maybe? send childs a signal on removal?	1188	# TODO: move to container class maybe? send children a signal on removal?
1069	sub clear {	1189	sub clear {
1070	my ($self) = @_;	1190	my ($self) = @_;
1071		1191
1072	my @children = $self->children;	1192	my @children = $self->children;
1073	delete $self->{children};	1193	delete $self->{children};
…		…
1075	for (@children) {	1195	for (@children) {
1076	delete $_->{parent};	1196	delete $_->{parent};
1077	$_->hide;	1197	$_->hide;
1078	}	1198	}
1079		1199
		1200	$self->check_size (1);
1080	$self->update;	1201	$self->update;
1081	}	1202	}
1082		1203
1083	sub get_wh {	1204	sub get_wh {
1084	my ($self) = @_;	1205	my ($self) = @_;
…		…
1116	sub size_allocate {	1237	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1118		1239
1119	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1120		1241
1121	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1123		1244
1124	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1302	}
1182	}	1303	}
1183		1304
1184	#############################################################################	1305	#############################################################################
1185		1306
1186	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1187
1188	# TODO: wrap into common Box base class
1189		1308
1190	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1191		1310
1192	sub size_request {	1311	sub size_request {
1193	my ($self) = @_;	1312	my ($self) = @_;
1194		1313
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1196		1315	? (
1197	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1198	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199	(List::Util::max map $_->[1], @alloc),	1318	)
1200	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1201	}	1323	}
1202		1324
1203	sub size_allocate {	1325	sub size_allocate {
1204	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1205		1327
1206	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1207
1208	my $children = $self->{children};	1329	my $children = $self->{children};
1209		1330
1210	my @h = map $_->{req_w}, @$children;	1331	my @req;
1211		1332
1212	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1213		1334	@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 {	1335	} else {
		1336	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1337	my $req = List::Util::sum @req;
		1338
		1339	if ($req > $space) {
		1340	# ah well, not enough space
		1341	$_ *= $space / $req for @req;
		1342	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219	$exp ||= 1;
1220		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1221	for (0 .. $#$children) {	1348	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	}	1349	}
1228	}	1350	}
1229		1351
1230	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1231		1353
1232	my $y = 0;	1354	my $pos = 0;
1233	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];	1356	my $alloc = $req[$_];
1236	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237		1358
1238	$y += $h;	1359	$pos += $alloc;
1239	}	1360	}
1240		1361
1241	1	1362	1
1242	}	1363	}
1243		1364
1244	#############################################################################	1365	#############################################################################
1245		1366
		1367	package CFClient::UI::HBox;
		1368
		1369	our @ISA = CFClient::UI::Box::;
		1370
		1371	sub new {
		1372	my $class = shift;
		1373
		1374	$class->SUPER::new (
		1375	vertical => 0,
		1376	@_,
		1377	)
		1378	}
		1379
		1380	#############################################################################
		1381
1246	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1247		1383
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1251		1385
1252	sub size_request {	1386	sub new {
1253	my ($self) = @_;	1387	my $class = shift;
1254		1388
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1256		1390	vertical => 1,
1257	(	1391	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1392	)
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	}	1393	}
1301		1394
1302	#############################################################################	1395	#############################################################################
1303		1396
1304	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
…		…
1488	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1489	can_hover => 1,	1582	can_hover => 1,
1490	can_focus => 1,	1583	can_focus => 1,
1491	valign => 0,	1584	valign => 0,
1492	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1493	@_	1587	@_
1494	)	1588	)
1495	}	1589	}
1496		1590
1497	sub _set_text {	1591	sub _set_text {
…		…
1507	$self->{text} = $text;	1601	$self->{text} = $text;
1508		1602
1509	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1511		1605
1512	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1513	}	1607	}
1514		1608
1515	sub set_text {	1609	sub set_text {
1516	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1517		1611
…		…
1529	my ($self) = @_;	1623	my ($self) = @_;
1530		1624
1531	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1532		1626
1533	($w + 1, $h) # add 1 for cursor	1627	($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	}	1628	}
1541		1629
1542	sub key_down {	1630	sub key_down {
1543	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1544		1632
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1652	$self->_emit ('escape');
1565	} elsif ($uni) {	1653	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1655	}
1568		1656
1569	$self->_set_text ($text);	1657	$self->_set_text ($text);
…		…
1656	if ($sym == 13) {	1744	if ($sym == 13) {
1657	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1662	$self->update;	1750	$self->update;
1663		1751
1664	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1714	can_events => 1,	1802	can_events => 1,
1715	@_	1803	@_
1716	)	1804	)
1717	}	1805	}
1718		1806
		1807	sub activate { }
		1808
1719	sub button_up {	1809	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1721		1811
		1812	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1815	}
1727		1816
1728	sub _draw {	1817	sub _draw {
1729	my ($self) = @_;	1818	my ($self) = @_;
1730		1819
…		…
1782	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1783		1872
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1788	}	1877	}
1789	}	1878	}
1790		1879
1791	sub _draw {	1880	sub _draw {
1792	my ($self) = @_;	1881	my ($self) = @_;
…		…
2067	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2158	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2159	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2160	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2075	vertical => 0,	2164	vertical => 0,
2076	can_hover => 1,	2165	can_hover => 1,
2077	inner_pad => 0.02,	2166	inner_pad => 0.02,
…		…
2082	$self->update;	2171	$self->update;
2083		2172
2084	$self	2173	$self
2085	}	2174	}
2086		2175
		2176	sub set_range {
		2177	my ($self, $range) = @_;
		2178
		2179	($range, $self->{range}) = ($self->{range}, $range);
		2180
		2181	$self->update
		2182	if "@$range" ne "@{$self->{range}}";
		2183	}
		2184
2087	sub set_value {	2185	sub set_value {
2088	my ($self, $value) = @_;	2186	my ($self, $value) = @_;
2089		2187
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2189
2092	$hi = $lo + 1 if $hi <= $lo;	2190	$hi = $lo + 1 if $hi <= $lo;
2093		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
2094	$value = $lo if $value < $lo;	2194	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2195	$value = $hi - $page if $value > $hi - $page;
2096		2196
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2198	if $unit;
2099		2199
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2201
2104	if ($value != $old_value) {	2202	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2203	$self->_emit (changed => $value);
2106	$self->update;	2204	$self->update;
2107	}	2205	}
2108	}	2206	}
2109		2207
2110	sub size_request {	2208	sub size_request {
…		…
2118		2216
2119	sub button_down {	2217	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2121		2219
2122	$self->SUPER::button_down ($ev, $x, $y);	2220	$self->SUPER::button_down ($ev, $x, $y);
		2221
		2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2223
2123	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2124	}	2225	}
2125		2226
2126	sub mouse_motion {	2227	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2232
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2234
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2236
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2238	}
2138	}	2239	}
2139		2240
2140	sub update {	2241	sub update {
2141	my ($self) = @_;	2242	my ($self) = @_;
2142		2243
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2245	$self->set_value ($self->{range}[0]);
2145		2246
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2147		2249
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2251
2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151		2254
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2255	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2256	$value = $value * $self->{scale} + $self->{offset};
2154		2257
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;	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2259	$self->{knob_w} = $knob_w;
2162	});	2260	});
2163		2261
2164	$self->SUPER::update;	2262	$self->SUPER::update;
2165	}	2263	}
2166		2264
…		…
2190	# draw handle	2288	# draw handle
2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192		2290
2193	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2194	}	2292	}
		2293
		2294	#############################################################################
		2295
		2296	package CFClient::UI::ValSlider;
		2297
		2298	our @ISA = CFClient::UI::HBox::;
		2299
		2300	sub new {
		2301	my ($class, %arg) = @_;
		2302
		2303	my $range = delete $arg{range};
		2304
		2305	my $self = $class->SUPER::new (
		2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2308	to_value => sub { shift },
		2309	from_value => sub { shift },
		2310	%arg,
		2311	);
		2312
		2313	$self->{slider}->connect (changed => sub {
		2314	my ($self, $value) = @_;
		2315	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2316	$self->{parent}->emit (changed => $value);
		2317	});
		2318
		2319	# $self->{entry}->connect (changed => sub {
		2320	# my ($self, $value) = @_;
		2321	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2322	# $self->{parent}->emit (changed => $value);
		2323	# });
		2324
		2325	$self->add ($self->{slider}, $self->{entry});
		2326
		2327	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2328
		2329	$self
		2330	}
		2331
		2332	sub set_range { shift->{slider}->set_range (@_) }
		2333	sub set_value { shift->{slider}->set_value (@_) }
2195		2334
2196	#############################################################################	2335	#############################################################################
2197		2336
2198	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2199		2338
…		…
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2381
2243	$self->reflow;	2382	$self->reflow;
2244	}	2383	}
2245		2384
2246	sub text_height {	2385	sub text_size {
2247	my ($self, $text, $indent) = @_;	2386	my ($self, $text, $indent) = @_;
2248		2387
2249	my $layout = $self->{layout};	2388	my $layout = $self->{layout};
2250		2389
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2391	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2392	$layout->set_markup ($text);
2254		2393
2255	($layout->size)[1]	2394	$layout->size
2256	}	2395	}
2257		2396
2258	sub reflow {	2397	sub reflow {
2259	my ($self) = @_;	2398	my ($self) = @_;
2260		2399
2261	$self->{need_reflow}++;	2400	$self->{need_reflow}++;
2262	$self->update;	2401	$self->update;
2263	}	2402	}
2264		2403
		2404	sub set_offset {
		2405	my ($self, $offset) = @_;
		2406
		2407	# todo: base offset on lines or so, not on pixels
		2408	$self->{children}[1]->set_value ($offset);
		2409	}
		2410
		2411	sub clear {
		2412	my ($self) = @_;
		2413
		2414	$self->{par} = [];
		2415	$self->{height} = 0;
		2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2417	}
		2418
2265	sub add_paragraph {	2419	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2267		2421
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2422	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2423	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2424	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2426	}
2275		2427
2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277	$self->{children}[1]->update;
2278	}	2429	}
2279		2430
2280	sub update {	2431	sub update {
2281	my ($self) = @_;	2432	my ($self) = @_;
2282		2433
…		…
2285	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2286		2437
2287	delete $self->{texture};	2438	delete $self->{texture};
2288		2439
2289	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2290	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2444	my $height = 0;
2292		2445
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2294	for @{$self->{par}};	2450	for (@{$self->{par}}) {
		2451	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2452	$layout->set_width ($W - $_->[3]);
		2453	$layout->set_markup ($_->[4]);
		2454	my ($w, $h) = $layout->size;
		2455	$_->[0] = $w + $_->[3];
		2456	$_->[1] = $h;
		2457	}
		2458
		2459	$height += $_->[1];
		2460	}
2295		2461
2296	$self->{height} = $height;	2462	$self->{height} = $height;
2297		2463
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2465
2301	delete $self->{texture};	2466	delete $self->{texture};
2302	}	2467	}
2303		2468
2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2469	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2307		2472
2308	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2309		2474
2310	my $y0 = $top;	2475	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2312		2477
2313	my $y = 0;	2478	my $y = 0;
2314		2479
2315	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2316		2481
2317	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2318		2483
2319	glEnable GL_BLEND;	2484	glEnable GL_BLEND;
		2485	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2486	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2487
2322	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2489	my $h = $par->[1];
2324		2490
2325	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2493	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2494	$layout->set_markup ($par->[4]);
2329		2495
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2497
2332	glRasterPos $par->[2], $y - $y0;	2498	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2500	}
2335		2501
2336	$y += $h;	2502	$y += $h;
2337	}	2503	}
…		…
2404		2570
2405	sub new {	2571	sub new {
2406	my $class = shift;	2572	my $class = shift;
2407		2573
2408	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2409	state => 0,	2575	state => 0,
2410	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2411	@_	2577	@_
2412	);	2578	);
2413		2579
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2580	$self
2420	}	2581	}
2421		2582
2422	sub toggle_flopper {	2583	sub toggle_flopper {
2423	my ($self) = @_;	2584	my ($self) = @_;
2424		2585
2425	# TODO: use animation	2586	$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	}	2587	}
2437		2588
2438	#############################################################################	2589	#############################################################################
2439		2590
2440	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2516		2667
2517	sub new {	2668	sub new {
2518	my $class = shift;	2669	my $class = shift;
2519		2670
2520	my $self = $class->SUPER::new (	2671	my $self = $class->SUPER::new (
2521	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2522	@_,	2674	@_,
2523	);	2675	);
2524		2676
2525	if ($self->{anim} && $self->{animspeed}) {	2677	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2678	Scalar::Util::weaken (my $widget = $self);
…		…
2552	}	2704	}
2553		2705
2554	sub _draw {	2706	sub _draw {
2555	my ($self) = @_;	2707	my ($self) = @_;
2556		2708
2557	return unless $::CONN;#d# manage and cache textures differently	2709	return unless $::CONN;
2558		2710
2559	my $face;	2711	my $face;
2560		2712
2561	if ($self->{frame}) {	2713	if ($self->{frame}) {
2562	my $anim = $::CONN->{anim}[$self->{anim}];	2714	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2585	$self->SUPER::DESTROY;	2737	$self->SUPER::DESTROY;
2586	}	2738	}
2587		2739
2588	#############################################################################	2740	#############################################################################
2589		2741
2590	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2591		2743
2592	our @ISA = CFClient::UI::HBox::;	2744	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		2745
2620	sub new {	2746	sub new {
2621	my $class = shift;	2747	my $class = shift;
2622		2748
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 (	2749	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),	2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2711	@_,	2751	@_,
2712	);	2752	);
2713		2753
2714	$self	2754	$self
2715	}	2755	}
…		…
2725	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2726	} @$items;	2766	} @$items;
2727		2767
2728	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2729		2769
		2770	my $row = 0;
2730	for my $item (@items) {	2771	for my $item (@items) {
2731	$item->{item} = $item;	2772	CFClient::Item::update_widgets $item;
2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733	$item->update_item ();
2734	}
2735		2773
2736	my $i = 0;	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2737	for (@items) {	2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2738	$self->{scrolled}->add (0, $i, $_);	2776	$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		2777
2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2778	$row++;
2744	}	2779	}
2745
2746	sub size_request {
2747	my ($self) = @_;
2748	($self->{req_w}, $self->{req_h});
2749	}	2780	}
2750		2781
2751	#############################################################################	2782	#############################################################################
2752		2783
2753	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2788		2819
2789	# popup given the event (must be a mouse button down event currently)	2820	# popup given the event (must be a mouse button down event currently)
2790	sub popup {	2821	sub popup {
2791	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2792		2823
2793	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2794		2825
2795	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2796	$GRAB = $self;	2827	$GRAB = $self;
2797	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2798		2829
…		…
2813		2844
2814	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2815	undef $GRAB;	2846	undef $GRAB;
2816	$self->hide;	2847	$self->hide;
2817		2848
2818	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2819	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2820	}	2851	}
2821	}	2852	}
2822		2853
2823	#############################################################################	2854	#############################################################################
…		…
2885	sub add {	2916	sub add {
2886	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2887		2918
2888	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2889	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2890		2923
2891	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2892		2925
2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894		2927
…		…
2938		2971
2939	sub new {	2972	sub new {
2940	my $class = shift;	2973	my $class = shift;
2941		2974
2942	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2943	@_,	2977	@_,
2944	)	2978	)
2945	}	2979	}
2946		2980
2947	sub configure {	2981	sub configure {
…		…
2965	}	2999	}
2966		3000
2967	sub size_allocate {	3001	sub size_allocate {
2968	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2969		3003
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) {	3004	for my $child ($self->children) {
2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978		3006
2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980	if exists $child->{req_x};	3008	if exists $child->{req_x};
2981		3009
2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983	if exists $child->{req_y};	3011	if exists $child->{req_y};
2984		3012
		3013	delete @$child{qw(req_x req_y)};
		3014
2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3015	$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;	3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987		3017
2988	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2989	}	3019	}
…		…
3010		3040
3011	sub add {	3041	sub add {
3012	my ($self, @children) = @_;	3042	my ($self, @children) = @_;
3013		3043
3014	for my $child (@children) {	3044	for my $child (@children) {
3015	$child->{toplevel} = 1;	3045	$child->{is_toplevel} = 1;
3016		3046
3017	# integerise window positions	3047	# integerise window positions
3018	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
3019	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
3020	}	3050	}
3021		3051
3022	$self->SUPER::add (@children);	3052	$self->SUPER::add (@children);
3023		3053
		3054	for (my @widgets = @children; my $w = pop @widgets; ) {
		3055	push @widgets, $w->children;
		3056	$w->set_visible;
		3057	}
		3058
		3059	}
		3060
		3061	sub remove {
		3062	my ($self, @children) = @_;
		3063
		3064	$self->SUPER::remove (@children);
		3065
3024	while (@children) {	3066	while (@children) {
3025	my $w = pop @children;	3067	my $w = pop @children;
3026	push @children, $w->children;	3068	push @children, $w->children;
3027	$w->{visible} = 1;	3069	$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	}	3070	}
3041	}	3071	}
3042		3072
3043	sub on_refresh {	3073	sub on_refresh {
3044	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
…		…
3059	$_->()	3089	$_->()
3060	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
3061	}	3091	}
3062		3092
3063	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
3064	my @queue = ([], []);	3094	my @queue;
3065		3095
3066	for (;;) {	3096	for (;;) {
3067	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
3068	# heuristic: check containers last	3098	#TODO use array-of-depth approach
3069	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
3070	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
3071	}	3102	}
3072		3103
3073	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
3074		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3076	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
3077	: $widget->size_request;	3110	: $widget->size_request;
3078		3111
3079	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3090	}	3123	}
3091	}	3124	}
3092	}	3125	}
3093		3126
3094	while ($self->{size_alloc}) {	3127	while ($self->{size_alloc}) {
		3128	for (
		3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }
3095	for (values %{delete $self->{size_alloc}}) {	3130	values %{delete $self->{size_alloc}}
		3131	) {
3096	my ($widget, $w, $h) = @$_;	3132	my ($widget, $w, $h) = @$_;
3097		3133
3098	$w = 0 if $w < 0;	3134	$w = 0 if $w < 0;
3099	$h = 0 if $h < 0;	3135	$h = 0 if $h < 0;
3100		3136
3101	$widget->{w} = $w;	3137	$widget->{w} = $w;
3102	$widget->{h} = $h;	3138	$widget->{h} = $h;
3103	$widget->size_allocate ($w, $h);
3104	$widget->emit (size_allocate => $w, $h);	3139	$widget->emit (size_allocate => $w, $h);
3105	}	3140	}
3106	}	3141	}
3107		3142
3108	while ($self->{post_alloc_hook}) {	3143	while ($self->{post_alloc_hook}) {

Diff Legend

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