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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 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	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31	}
		32
		33	$layout
		34	}
		35
		36	sub set_layout {
		37	my ($layout) = @_;
		38	$LAYOUT = $layout;
		39	}
18		40
19	sub check_tooltip {	41	sub check_tooltip {
20	if (!$GRAB) {	42	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	44	if (length $widget->{tooltip}) {
23		45
24	if ($TOOLTIP->{owner} != $widget) {	46	if ($TOOLTIP->{owner} != $widget) {
		47	$TOOLTIP->hide;
		48
25	$TOOLTIP->{owner} = $widget;	49	$TOOLTIP->{owner} = $widget;
26		50
27	my $tip = $widget->{tooltip};	51	my $tip = $widget->{tooltip};
28		52
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	53	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		54
31	$TOOLTIP->set_tooltip_from ($widget);	55	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	56	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	57	}
43		58
44	return;	59	return;
45	}	60	}
46	}	61	}
…		…
50	delete $TOOLTIP->{owner};	65	delete $TOOLTIP->{owner};
51	}	66	}
52		67
53	# class methods for events	68	# class methods for events
54	sub feed_sdl_key_down_event {	69	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	70	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	71	if $FOCUS;
57	}	72	}
58		73
59	sub feed_sdl_key_up_event {	74	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	75	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	76	if $FOCUS;
62	}	77	}
63		78
64	sub feed_sdl_button_down_event {	79	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	80	my ($ev) = @_;
…		…
74	check_tooltip;	89	check_tooltip;
75	}	90	}
76		91
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	92	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		93
79	if ($GRAB) {	94	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	95	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	96	}
84		97
85	sub feed_sdl_button_up_event {	98	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	99	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
88		101
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	102	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		103
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	104	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		105
93	if ($GRAB) {	106	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	107	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		108
98	if (!$BUTTON_STATE) {	109	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	110	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	111	$grab->update if $grab;
101	$GRAB->update if $GRAB;	112	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	128	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		129
119	check_tooltip;	130	check_tooltip;
120	}	131	}
121		132
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	133	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	134	if $HOVER;
126	}	135	}
127		136
128	# convert position array to integers	137	# convert position array to integers
129	sub harmonize {	138	sub harmonize {
130	my ($vals) = @_;	139	my ($vals) = @_;
…		…
144		153
145	$_->update	154	$_->update
146	for @widgets;	155	for @widgets;
147	}	156	}
148		157
		158	sub reconfigure_widgets {
		159	# make a copy, otherwise C<for> complains about freed values.
		160	my @widgets = values %WIDGET;
		161
		162	$_->reconfigure
		163	for @widgets;
		164	}
		165
149	# call when resolution changes etc.	166	# call when resolution changes etc.
150	sub rescale_widgets {	167	sub rescale_widgets {
151	my ($sx, $sy) = @_;	168	my ($sx, $sy) = @_;
152		169
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	170	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	171	if ($widget->{is_toplevel}) {
		172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		174
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	176	$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};	177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_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};	178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	179	$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};	180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	181
		182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		184
166	}	185	}
167
168	$widget->reconfigure;
169	}	186	}
		187
		188	reconfigure_widgets;
170	}	189	}
171		190
172	#############################################################################	191	#############################################################################
173		192
174	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
179		198
180	sub new {	199	sub new {
181	my $class = shift;	200	my $class = shift;
182		201
183	my $self = bless {	202	my $self = bless {
184	x => 0,	203	x => "center",
185	y => 0,	204	y => "center",
186	z => 0,	205	z => 0,
		206	w => undef,
		207	h => undef,
187	can_events => 1,	208	can_events => 1,
188	@_	209	@_
189	}, $class;	210	}, $class;
190		211
		212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		217
		218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		220	}
		221
		222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		223
191	for (keys %$self) {	224	for (keys %$self) {
192	if (/^connect_(.*)$/) {	225	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	226	$self->connect ($1 => delete $self->{$_});
194	}	227	}
195	}	228	}
196		229
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
199	$self	230	$self
200	}	231	}
201		232
202	sub destroy {	233	sub destroy {
203	my ($self) = @_;	234	my ($self) = @_;
…		…
206	%$self = ();	237	%$self = ();
207	}	238	}
208		239
209	sub show {	240	sub show {
210	my ($self) = @_;	241	my ($self) = @_;
		242
211	return if $self->{parent};	243	return if $self->{parent};
212		244
213	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
214	}	246	}
215		247
216	sub show_centered {	248	sub set_visible {
217	my ($self) = @_;	249	my ($self) = @_;
		250
218	return if $self->{parent};	251	return if $self->{visible};
219		252
220	$self->show;	253	$self->{root} = $self->{parent}{root};
		254	$self->{visible} = $self->{parent}{visible} + 1;
221		255
222	$CFClient::UI::ROOT->on_post_alloc (	256	$self->emit (visibility_change => 1);
223	"centered $self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},
226	);
227	}
228		257
229	sub hide {	258	$self->realloc if !exists $self->{req_w};
		259
		260	$_->set_visible for $self->children;
		261	}
		262
		263	sub set_invisible {
230	my ($self) = @_;	264	my ($self) = @_;
		265
		266	return unless $self->{visible};
		267
		268	$_->set_invisible for $self->children;
		269
		270	delete $self->{root};
		271	delete $self->{visible};
231		272
232	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
234		275
		276	CFClient::UI::check_tooltip
		277	if $TOOLTIP->{owner} == $self;
		278
		279	$self->focus_out;
		280
		281	$self->emit (visibility_change => 0);
		282	}
		283
		284	sub set_visibility {
		285	my ($self, $visible) = @_;
		286
		287	return if $self->{visible} == $visible;
		288
		289	$visible ? $self->hide
		290	: $self->show;
		291	}
		292
		293	sub toggle_visibility {
		294	my ($self) = @_;
		295
		296	$self->{visible}
		297	? $self->hide
		298	: $self->show;
		299	}
		300
		301	sub hide {
		302	my ($self) = @_;
		303
		304	$self->set_invisible;
		305
235	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
236	if $self->{parent};	307	if $self->{parent};
237	}	308	}
238		309
239	sub move {	310	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
241		312
242	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
245		316
246	$self->update;	317	$self->update;
247	}	318	}
248		319
249	sub set_size {	320	sub set_size {
250	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
251		322
252	$self->{user_w} = $w;	323	$self->{force_w} = $w;
253	$self->{user_h} = $h;	324	$self->{force_h} = $h;
254		325
255	$self->check_size;	326	$self->realloc;
256	}	327	}
257		328
258	sub size_request {	329	sub size_request {
259	require Carp;	330	require Carp;
260	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
262		333
263	sub configure {	334	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
265		336
266	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
269		342
270	# use alignment to adjust x, y	343	# use alignment to adjust x, y
271		344
272	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	347	}
277		348
278	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	350	$self->{x} = $x;
280	$self->{y} = $y;	351	$self->{y} = $y;
281	$self->update;	352	$self->update;
282	}	353	}
283		354
284	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
		356	return unless $self->{visible};
		357
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286	}	359	}
287	}	360	}
288		361
289	sub size_allocate {	362	sub size_allocate {
290	# nothing to be done	363	# nothing to be done
291	}	364	}
292		365
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	366	sub children {
301	}	367	}
302		368
303	sub set_max_size {	369	sub set_max_size {
304	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	374	}
309		375
310	sub set_tooltip {	376	sub set_tooltip {
311	my ($self, $tooltip) = @_;	377	my ($self, $tooltip) = @_;
		378
		379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
312		383
313	$self->{tooltip} = $tooltip;	384	$self->{tooltip} = $tooltip;
314		385
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	387	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	409	return if $FOCUS == $self;
339	return unless $self->{can_focus};	410	return unless $self->{can_focus};
340		411
341	my $focus = $FOCUS; $FOCUS = $self;	412	my $focus = $FOCUS; $FOCUS = $self;
342		413
343	$self->emit (focus_in => $focus);	414	$self->_emit (focus_in => $focus);
344		415
345	$focus->update if $focus;	416	$focus->update if $focus;
346	$FOCUS->update;	417	$FOCUS->update;
347	}	418	}
348		419
…		…
351		422
352	return unless $FOCUS == $self;	423	return unless $FOCUS == $self;
353		424
354	my $focus = $FOCUS; undef $FOCUS;	425	my $focus = $FOCUS; undef $FOCUS;
355		426
356	$self->emit (focus_out => $focus);	427	$self->_emit (focus_out => $focus);
357		428
358	$focus->update if $focus; #?	429	$focus->update if $focus; #?
		430
		431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		432	unless $FOCUS;
359	}	433	}
360		434
361	sub mouse_motion { }	435	sub mouse_motion { }
362	sub button_up { }	436	sub button_up { }
363	sub key_down { }	437	sub key_down { }
364	sub key_up { }	438	sub key_up { }
365		439
366	sub button_down {	440	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	441	my ($self, $ev, $x, $y) = @_;
368		442
369	$self->focus_in;	443	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		451
		452	sub find_widget {
		453	my ($self, $x, $y) = @_;
		454
		455	return () unless $self->{can_events};
		456
		457	return $self
		458	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		459	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		460
		461	()
		462	}
		463
		464	sub set_parent {
		465	my ($self, $parent) = @_;
		466
		467	Scalar::Util::weaken ($self->{parent} = $parent);
		468
		469	$self->set_visible if $parent->{visible};
		470	}
		471
		472	sub connect {
		473	my ($self, $signal, $cb) = @_;
		474
		475	push @{ $self->{signal_cb}{$signal} }, $cb;
		476	}
		477
		478	sub _emit {
		479	my ($self, $signal, @args) = @_;
		480
		481	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		482	}
		483
		484	sub emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	$self->_emit ($signal, @args)
		488	|| $self->$signal (@args);
		489	}
		490
		491	sub visibility_change {
		492	#my ($self, $visible) = @_;
		493	}
		494
		495	sub realloc {
		496	my ($self) = @_;
		497
		498	if ($self->{visible}) {
		499	return if $self->{root}{realloc}{$self};
		500
		501	$self->{root}{realloc}{$self} = $self;
		502	$self->{root}->update;
		503	} else {
		504	delete $self->{req_w};
		505	}
		506	}
		507
		508	sub update {
		509	my ($self) = @_;
		510
		511	$self->{parent}->update
		512	if $self->{parent};
		513	}
		514
		515	sub reconfigure {
		516	my ($self) = @_;
		517
		518	$self->realloc;
		519	$self->update;
		520	}
377		521
378	sub draw {	522	sub draw {
379	my ($self) = @_;	523	my ($self) = @_;
380		524
381	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
398	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
399	glEnd;	543	glEnd;
400	glDisable GL_BLEND;	544	glDisable GL_BLEND;
401	}	545	}
402		546
403	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
404	glPushMatrix;	548	glPushMatrix;
405	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	552	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
412	glEnd;	556	glEnd;
413	glPopMatrix;	557	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	559	}
416	}	560	}
417		561
418	sub _draw {	562	sub _draw {
419	my ($self) = @_;	563	my ($self) = @_;
420		564
421	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	566	}
473		567
474	sub DESTROY {	568	sub DESTROY {
475	my ($self) = @_;	569	my ($self) = @_;
476		570
…		…
534	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
536	}	630	}
537		631
538	sub size_request {	632	sub size_request {
539	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
540	}	636	}
541		637
542	sub draw { }	638	sub draw { }
543		639
544	#############################################################################	640	#############################################################################
…		…
573	$self->{children} = [	669	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
576	];	672	];
577		673
578	$self->check_size (1);	674	$self->realloc;
579	$self->update;
580	}	675	}
581		676
582	sub children {	677	sub children {
583	@{ $_[0]{children} }	678	@{ $_[0]{children} }
584	}	679	}
…		…
589	delete $child->{parent};	684	delete $child->{parent};
590	$child->hide;	685	$child->hide;
591		686
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		688
594	$self->check_size;	689	$self->realloc;
595	$self->update;
596	}	690	}
597		691
598	sub clear {	692	sub clear {
599	my ($self) = @_;	693	my ($self) = @_;
600		694
…		…
604	for (@$children) {	698	for (@$children) {
605	delete $_->{parent};	699	delete $_->{parent};
606	$_->hide;	700	$_->hide;
607	}	701	}
608		702
609	$self->check_size;	703	$self->realloc;
610	$self->update;
611	}	704	}
612		705
613	sub find_widget {	706	sub find_widget {
614	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
615		708
…		…
668	sub size_request {	761	sub size_request {
669	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
670	}	763	}
671		764
672	sub size_allocate {	765	sub size_allocate {
673	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
674		767
675	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	769	}
677		770
678	#############################################################################	771	#############################################################################
…		…
695	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
696	$self->SUPER::update;	789	$self->SUPER::update;
697	}	790	}
698		791
699	sub size_allocate {	792	sub size_allocate {
700	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
701		794
702	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
703	$self->update;	796	$self->update
		797	if $changed;
704	}	798	}
705		799
706	sub _render {	800	sub _render {
707	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
708	}	802	}
…		…
739		833
740	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
741		835
742	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
743		837
		838	sub new {
		839	my $class = shift;
		840
		841	$class->SUPER::new (
		842	scroll_x => 0,
		843	scroll_y => 1,
		844	@_,
		845	)
		846	}
		847
744	sub size_request {	848	sub size_request {
745	my ($self) = @_;	849	my ($self) = @_;
746		850
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	851	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		852
750	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
751	}	857	}
752		858
753	sub size_allocate {	859	sub size_allocate {
754	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
755		861
		862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		864
		865	$self->child->configure (0, 0, $w, $h);
756	$self->update;	866	$self->update;
757	}	867	}
758		868
759	sub set_offset {	869	sub set_offset {
760	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	921	my $class = shift;
812		922
813	my $self;	923	my $self;
814		924
815	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
816	vertical => 1,	926	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	928	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	929	$self->{vp}->set_offset (0, $_[1]);
820	},	930	},
821	;	931	;
822		932
823	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	934	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	939	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	940	$self->add ($self->{vp});
831	$self->add ($self->{slider});	941	$self->add ($self->{slider});
832		942
833	$self	943	$self
		944	}
		945
		946	sub update {
		947	my ($self) = @_;
		948
		949	$self->SUPER::update;
		950
		951	# todo: overwrite size_allocate of child
		952	my $child = $self->{vp}->child;
		953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		954	}
		955
		956	sub size_allocate {
		957	my ($self, $w, $h, $changed) = @_;
		958
		959	$self->SUPER::size_allocate ($w, $h, $changed);
		960
		961	my $child = $self->{vp}->child;
		962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834	}	963	}
835		964
836	#TODO# update range on size_allocate depending on child	965	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	966	# update viewport offset on scroll
838		967
…		…
882		1011
883	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
884		1013
885	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
886		1015
887	my @tex =	1016	my $bg =
		1017	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1018	mipmap => 1, wrap => 1;
		1019
		1020	my @border =
888	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890		1023
891	sub new {	1024	sub new {
892	my $class = shift;	1025	my $class = shift;
893		1026
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1030	border => 0.6,
900	toplevel => 1,	1031	is_toplevel => 1,
901	can_events => 1,	1032	can_events => 1,
902	@_	1033	@_
903	);	1034	);
904		1035
905	$self->{title} &&= new CFClient::UI::Label	1036	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1037	align => 0,
…		…
925	$h + $self->border * 2,	1056	$h + $self->border * 2,
926	)	1057	)
927	}	1058	}
928		1059
929	sub size_allocate {	1060	sub size_allocate {
930	my ($self, $w, $h) = @_;	1061	my ($self, $w, $h, $changed) = @_;
		1062
		1063	return unless $changed;
931		1064
932	$h -= List::Util::max 0, $self->border * 2;	1065	$h -= List::Util::max 0, $self->border * 2;
933	$w -= List::Util::max 0, $self->border * 2;	1066	$w -= List::Util::max 0, $self->border * 2;
934		1067
935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
959	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
960		1093
961	my $dx = $ev->{x} - $ox;	1094	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1095	my $dy = $ev->{y} - $oy;
963		1096
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1099
		1100	$self->realloc;
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967	$self->check_size;
968	};	1102	};
969		1103
970	} elsif ($lr ^ $td) {	1104	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});
972	my ($bx, $by) = ($self->{x}, $self->{y});	1106	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
974	$self->{motion} = sub {	1108	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1109	my ($ev, $x, $y) = @_;
976		1110
977	($x, $y) = ($ev->{x}, $ev->{y});	1111	($x, $y) = ($ev->{x}, $ev->{y});
978		1112
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1113	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980	$self->update;
981	};	1114	};
982	}	1115	}
983	}	1116	}
984		1117
985	sub button_up {	1118	sub button_up {
…		…
1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005		1138
1006	my $border = $self->border;	1139	my $border = $self->border;
1007		1140
1008	glColor @{ $self->{border_bg} };	1141	glColor @{ $self->{border_bg} };
1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1142	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1143	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1144	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1145	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013		1146
1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1147	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015	my $bg = $tex[0];	1148	glColor @{ $self->{bg} };
1016		1149
1017	# TODO: repeat texture not scale	1150	# TODO: repeat texture not scale
		1151	# solve this better(?)
1018	my $rep_x = $cw / $bg->{w};	1152	$bg->{s} = $cw / $bg->{w};
1019	my $rep_y = $ch / $bg->{h};	1153	$bg->{t} = $ch / $bg->{h};
1020
1021	glColor @{ $self->{bg} };
1022
1023	$bg->{s} = $rep_x;
1024	$bg->{t} = $rep_y;
1025	$bg->{wrap_mode} = 1;
1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027	}	1155	}
1028		1156
1029	glDisable GL_TEXTURE_2D;	1157	glDisable GL_TEXTURE_2D;
1030		1158
…		…
1046	sub new {	1174	sub new {
1047	my $class = shift;	1175	my $class = shift;
1048		1176
1049	$class->SUPER::new (	1177	$class->SUPER::new (
1050	col_expand => [],	1178	col_expand => [],
1051	@_	1179	@_,
1052	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1185	}
1054		1186
1055	sub add {	1187	sub add {
1056	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1057		1189
1058	$child->set_parent ($self);	1190	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1060		1192
1061	$child->check_size;	1193	$self->realloc;
1062	}	1194	}
1063		1195
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# TODO: move to container class maybe? send childs a signal on removal?	1196	# TODO: move to container class maybe? send children a signal on removal?
1069	sub clear {	1197	sub clear {
1070	my ($self) = @_;	1198	my ($self) = @_;
1071		1199
1072	my @children = $self->children;	1200	my @children = $self->children;
1073	delete $self->{children};	1201	delete $self->{children};
…		…
1075	for (@children) {	1203	for (@children) {
1076	delete $_->{parent};	1204	delete $_->{parent};
1077	$_->hide;	1205	$_->hide;
1078	}	1206	}
1079		1207
1080	$self->update;	1208	$self->realloc;
1081	}	1209	}
1082		1210
1083	sub get_wh {	1211	sub get_wh {
1084	my ($self) = @_;	1212	my ($self) = @_;
1085		1213
…		…
1112	(sum @$hs),	1240	(sum @$hs),
1113	)	1241	)
1114	}	1242	}
1115		1243
1116	sub size_allocate {	1244	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1118		1246
1119	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1120		1248
1121	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1123		1251
1124	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1309	}
1182	}	1310	}
1183		1311
1184	#############################################################################	1312	#############################################################################
1185		1313
		1314	package CFClient::UI::Box;
		1315
		1316	our @ISA = CFClient::UI::Container::;
		1317
		1318	sub size_request {
		1319	my ($self) = @_;
		1320
		1321	$self->{vertical}
		1322	? (
		1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1325	)
		1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
		1330	}
		1331
		1332	sub size_allocate {
		1333	my ($self, $w, $h, $changed) = @_;
		1334
		1335	my $space = $self->{vertical} ? $h : $w;
		1336	my $children = $self->{children};
		1337
		1338	my @req;
		1339
		1340	if ($self->{homogeneous}) {
		1341	@req = ($space / (@$children || 1)) x @$children;
		1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
		1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
		1355	for 0 .. $#$children;
		1356	}
		1357	}
		1358
		1359	CFClient::UI::harmonize \@req;
		1360
		1361	my $pos = 0;
		1362	for (0 .. $#$children) {
		1363	my $alloc = $req[$_];
		1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1365
		1366	$pos += $alloc;
		1367	}
		1368
		1369	1
		1370	}
		1371
		1372	#############################################################################
		1373
1186	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1187		1375
1188	# TODO: wrap into common Box base class
1189
1190	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1191		1377
1192	sub size_request {	1378	sub new {
1193	my ($self) = @_;	1379	my $class = shift;
1194		1380
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1196		1382	vertical => 0,
1197	(	1383	@_,
1198	(List::Util::sum map $_->[0], @alloc),
1199	(List::Util::max map $_->[1], @alloc),
1200	)	1384	)
1201	}	1385	}
1202		1386
1203	sub size_allocate {
1204	my ($self, $w, $h) = @_;
1205
1206	($h, $w) = ($w, $h);
1207
1208	my $children = $self->{children};
1209
1210	my @h = map $_->{req_w}, @$children;
1211
1212	my $req_h = List::Util::sum @h;
1213
1214	if ($req_h > $h) {
1215	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;
1217	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;
1219	$exp ||= 1;
1220
1221	for (0 .. $#$children) {
1222	my $child = $children->[$_];
1223
1224	my $alloc_h = $h[$_];
1225	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226	$h[$_] = $alloc_h;
1227	}
1228	}
1229
1230	CFClient::UI::harmonize \@h;
1231
1232	my $y = 0;
1233	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];
1236	$child->configure ($y, 0, $h, $w);
1237
1238	$y += $h;
1239	}
1240
1241	1
1242	}
1243
1244	#############################################################################	1387	#############################################################################
1245		1388
1246	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1247		1390
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1251		1392
1252	sub size_request {	1393	sub new {
1253	my ($self) = @_;	1394	my $class = shift;
1254		1395
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1256		1397	vertical => 1,
1257	(	1398	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1399	)
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	}	1400	}
1301		1401
1302	#############################################################################	1402	#############################################################################
1303		1403
1304	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1367	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1368		1468
1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1371		1471
		1472	$self->realloc;
1372	$self->update;	1473	$self->update;
1373	$self->check_size;
1374	}	1474	}
1375		1475
1376	sub set_markup {	1476	sub set_markup {
1377	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1378		1478
…		…
1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383		1483
1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1386		1486
		1487	$self->realloc;
1387	$self->update;	1488	$self->update;
1388	$self->check_size;
1389	}	1489	}
1390		1490
1391	sub size_request {	1491	sub size_request {
1392	my ($self) = @_;	1492	my ($self) = @_;
1393		1493
…		…
1414	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1415	)	1515	)
1416	}	1516	}
1417		1517
1418	sub size_allocate {	1518	sub size_allocate {
1419	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1420		1520
1421	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1422	}	1523	}
1423		1524
1424	sub set_fontsize {	1525	sub set_fontsize {
1425	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1426		1527
1427	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1428	delete $self->{texture};	1529	delete $self->{texture};
1429		1530
1430	$self->update;	1531	$self->realloc;
1431	$self->check_size;
1432	}	1532	}
1433		1533
1434	sub _draw {	1534	sub _draw {
1435	my ($self) = @_;	1535	my ($self) = @_;
1436		1536
…		…
1488	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1489	can_hover => 1,	1589	can_hover => 1,
1490	can_focus => 1,	1590	can_focus => 1,
1491	valign => 0,	1591	valign => 0,
1492	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1493	@_	1594	@_
1494	)	1595	)
1495	}	1596	}
1496		1597
1497	sub _set_text {	1598	sub _set_text {
…		…
1507	$self->{text} = $text;	1608	$self->{text} = $text;
1508		1609
1509	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1511		1612
1512	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1513	}	1614	}
1514		1615
1515	sub set_text {	1616	sub set_text {
1516	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1517		1618
1518	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1519	$self->_set_text ($text);	1620	$self->_set_text ($text);
1520	$self->update;	1621
1521	$self->check_size;	1622	$self->realloc;
1522	}	1623	}
1523		1624
1524	sub get_text {	1625	sub get_text {
1525	$_[0]{text}	1626	$_[0]{text}
1526	}	1627	}
…		…
1529	my ($self) = @_;	1630	my ($self) = @_;
1530		1631
1531	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1532		1633
1533	($w + 1, $h) # add 1 for cursor	1634	($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	}	1635	}
1541		1636
1542	sub key_down {	1637	sub key_down {
1543	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1544		1639
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1659	$self->_emit ('escape');
1565	} elsif ($uni) {	1660	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1662	}
1568		1663
1569	$self->_set_text ($text);	1664	$self->_set_text ($text);
1570	$self->update;	1665
1571	$self->check_size;	1666	$self->realloc;
1572	}	1667	}
1573		1668
1574	sub focus_in {	1669	sub focus_in {
1575	my ($self) = @_;	1670	my ($self) = @_;
1576		1671
…		…
1656	if ($sym == 13) {	1751	if ($sym == 13) {
1657	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1662	$self->update;	1757	$self->update;
1663		1758
1664	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1714	can_events => 1,	1809	can_events => 1,
1715	@_	1810	@_
1716	)	1811	)
1717	}	1812	}
1718		1813
		1814	sub activate { }
		1815
1719	sub button_up {	1816	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1721		1818
		1819	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1822	}
1727		1823
1728	sub _draw {	1824	sub _draw {
1729	my ($self) = @_;	1825	my ($self) = @_;
1730		1826
…		…
1782	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1783		1879
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1788	}	1884	}
1789	}	1885	}
1790		1886
1791	sub _draw {	1887	sub _draw {
1792	my ($self) = @_;	1888	my ($self) = @_;
…		…
2067	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2075	vertical => 0,	2171	vertical => 0,
2076	can_hover => 1,	2172	can_hover => 1,
2077	inner_pad => 0.02,	2173	inner_pad => 0.02,
…		…
2082	$self->update;	2178	$self->update;
2083		2179
2084	$self	2180	$self
2085	}	2181	}
2086		2182
		2183	sub changed { }
		2184
		2185	sub set_range {
		2186	my ($self, $range) = @_;
		2187
		2188	($range, $self->{range}) = ($self->{range}, $range);
		2189
		2190	$self->update
		2191	if "@$range" ne "@{$self->{range}}";
		2192	}
		2193
2087	sub set_value {	2194	sub set_value {
2088	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2089		2196
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2197	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2198
2092	$hi = $lo + 1 if $hi <= $lo;	2199	$hi = $lo + 1 if $hi <= $lo;
2093		2200
		2201	$page = $hi - $lo if $page > $hi - $lo;
		2202
2094	$value = $lo if $value < $lo;	2203	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2204	$value = $hi - $page if $value > $hi - $page;
2096		2205
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2206	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2207	if $unit;
2099		2208
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2209	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2210
2104	if ($value != $old_value) {	2211	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2212	$self->_emit (changed => $value);
2106	$self->update;	2213	$self->update;
2107	}	2214	}
2108	}	2215	}
2109		2216
2110	sub size_request {	2217	sub size_request {
…		…
2118		2225
2119	sub button_down {	2226	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2121		2228
2122	$self->SUPER::button_down ($ev, $x, $y);	2229	$self->SUPER::button_down ($ev, $x, $y);
		2230
		2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2232
2123	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2124	}	2234	}
2125		2235
2126	sub mouse_motion {	2236	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2239	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2241
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2242	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2243
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2245
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2247	}
2138	}	2248	}
2139		2249
2140	sub update {	2250	sub update {
2141	my ($self) = @_;	2251	my ($self) = @_;
2142		2252
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2254	$self->set_value ($self->{range}[0]);
2145		2255
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2147		2258
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2260
2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2261	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2262	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151		2263
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2264	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2265	$value = $value * $self->{scale} + $self->{offset};
2154		2266
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;	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2268	$self->{knob_w} = $knob_w;
2162	});	2269	});
2163		2270
2164	$self->SUPER::update;	2271	$self->SUPER::update;
2165	}	2272	}
2166		2273
…		…
2190	# draw handle	2297	# draw handle
2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2298	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192		2299
2193	glDisable GL_TEXTURE_2D;	2300	glDisable GL_TEXTURE_2D;
2194	}	2301	}
		2302
		2303	#############################################################################
		2304
		2305	package CFClient::UI::ValSlider;
		2306
		2307	our @ISA = CFClient::UI::HBox::;
		2308
		2309	sub new {
		2310	my ($class, %arg) = @_;
		2311
		2312	my $range = delete $arg{range};
		2313
		2314	my $self = $class->SUPER::new (
		2315	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2316	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2317	to_value => sub { shift },
		2318	from_value => sub { shift },
		2319	%arg,
		2320	);
		2321
		2322	$self->{slider}->connect (changed => sub {
		2323	my ($self, $value) = @_;
		2324	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2325	$self->{parent}->emit (changed => $value);
		2326	});
		2327
		2328	# $self->{entry}->connect (changed => sub {
		2329	# my ($self, $value) = @_;
		2330	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2331	# $self->{parent}->emit (changed => $value);
		2332	# });
		2333
		2334	$self->add ($self->{slider}, $self->{entry});
		2335
		2336	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2337
		2338	$self
		2339	}
		2340
		2341	sub set_range { shift->{slider}->set_range (@_) }
		2342	sub set_value { shift->{slider}->set_value (@_) }
2195		2343
2196	#############################################################################	2344	#############################################################################
2197		2345
2198	package CFClient::UI::TextView;	2346	package CFClient::UI::TextView;
2199		2347
…		…
2230	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2231	$self->reflow;	2379	$self->reflow;
2232	}	2380	}
2233		2381
2234	sub size_allocate {	2382	sub size_allocate {
2235	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2236		2384
2237	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2238		2388
2239	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2240	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2392
2243	$self->reflow;	2393	$self->reflow;
2244	}	2394	}
2245		2395
2246	sub text_height {	2396	sub text_size {
2247	my ($self, $text, $indent) = @_;	2397	my ($self, $text, $indent) = @_;
2248		2398
2249	my $layout = $self->{layout};	2399	my $layout = $self->{layout};
2250		2400
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2401	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2402	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2403	$layout->set_markup ($text);
2254		2404
2255	($layout->size)[1]	2405	$layout->size
2256	}	2406	}
2257		2407
2258	sub reflow {	2408	sub reflow {
2259	my ($self) = @_;	2409	my ($self) = @_;
2260		2410
2261	$self->{need_reflow}++;	2411	$self->{need_reflow}++;
2262	$self->update;	2412	$self->update;
2263	}	2413	}
2264		2414
		2415	sub set_offset {
		2416	my ($self, $offset) = @_;
		2417
		2418	# todo: base offset on lines or so, not on pixels
		2419	$self->{children}[1]->set_value ($offset);
		2420	}
		2421
		2422	sub clear {
		2423	my ($self) = @_;
		2424
		2425	$self->{par} = [];
		2426	$self->{height} = 0;
		2427	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2428	}
		2429
2265	sub add_paragraph {	2430	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2267		2432
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2433	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2434	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2435	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2437	}
2275		2438
2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2439	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277	$self->{children}[1]->update;
2278	}	2440	}
2279		2441
2280	sub update {	2442	sub update {
2281	my ($self) = @_;	2443	my ($self) = @_;
2282		2444
…		…
2285	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2286		2448
2287	delete $self->{texture};	2449	delete $self->{texture};
2288		2450
2289	$ROOT->on_post_alloc ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2290	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2455	my $height = 0;
2292		2456
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2294	for @{$self->{par}};	2461	for (@{$self->{par}}) {
		2462	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2463	$layout->set_width ($W - $_->[3]);
		2464	$layout->set_markup ($_->[4]);
		2465	my ($w, $h) = $layout->size;
		2466	$_->[0] = $w + $_->[3];
		2467	$_->[1] = $h;
		2468	}
		2469
		2470	$height += $_->[1];
		2471	}
2295		2472
2296	$self->{height} = $height;	2473	$self->{height} = $height;
2297		2474
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2476
2301	delete $self->{texture};	2477	delete $self->{texture};
2302	}	2478	}
2303		2479
2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2307		2483
2308	my $top = int $self->{children}[1]{range}[0];	2484	my $top = int $self->{children}[1]{range}[0];
2309		2485
2310	my $y0 = $top;	2486	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2487	my $y1 = $top + $H;
2312		2488
2313	my $y = 0;	2489	my $y = 0;
2314		2490
2315	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2316		2492
2317	$layout->set_font ($self->{font}) if $self->{font};	2493	$layout->set_font ($self->{font}) if $self->{font};
2318		2494
2319	glEnable GL_BLEND;	2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2498
2322	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2500	my $h = $par->[1];
2324		2501
2325	if ($y0 < $y + $h && $y < $y1) {	2502	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2503	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2504	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2505	$layout->set_markup ($par->[4]);
2329		2506
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2508
2332	glRasterPos $par->[2], $y - $y0;	2509	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2510	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2511	}
2335		2512
2336	$y += $h;	2513	$y += $h;
2337	}	2514	}
…		…
2404		2581
2405	sub new {	2582	sub new {
2406	my $class = shift;	2583	my $class = shift;
2407		2584
2408	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2409	state => 0,	2586	state => 0,
2410	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2411	@_	2588	@_
2412	);	2589	);
2413		2590
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2591	$self
2420	}	2592	}
2421		2593
2422	sub toggle_flopper {	2594	sub toggle_flopper {
2423	my ($self) = @_;	2595	my ($self) = @_;
2424		2596
2425	# TODO: use animation	2597	$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	}	2598	}
2437		2599
2438	#############################################################################	2600	#############################################################################
2439		2601
2440	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2472		2634
2473	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2474	}	2636	}
2475		2637
2476	sub size_allocate {	2638	sub size_allocate {
2477	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2478		2640
		2641	return unless $changed;
		2642
2479	$self->SUPER::size_allocate ($w - 4, $h - 4);	2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2644	}
		2645
		2646	sub visibility_change {
		2647	my ($self, $visible) = @_;
		2648
		2649	return unless $visible;
		2650
		2651	$self->{root}->on_post_alloc ("move_$self" => sub {
		2652	my $widget = $self->{owner}
		2653	or return;
		2654
		2655	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2656
		2657	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2658	if $x + $self->{w} > $::WIDTH;
		2659
		2660	$self->move_abs ($x, $y);
		2661	});
2480	}	2662	}
2481		2663
2482	sub _draw {	2664	sub _draw {
2483	my ($self) = @_;	2665	my ($self) = @_;
2484		2666
…		…
2501	glVertex $w, $h;	2683	glVertex $w, $h;
2502	glVertex $w, 0;	2684	glVertex $w, 0;
2503	glEnd;	2685	glEnd;
2504		2686
2505	glTranslate 2 - 0.375, 2 - 0.375;	2687	glTranslate 2 - 0.375, 2 - 0.375;
		2688
2506	$self->SUPER::_draw;	2689	$self->SUPER::_draw;
2507	}	2690	}
2508		2691
2509	#############################################################################	2692	#############################################################################
2510		2693
…		…
2516		2699
2517	sub new {	2700	sub new {
2518	my $class = shift;	2701	my $class = shift;
2519		2702
2520	my $self = $class->SUPER::new (	2703	my $self = $class->SUPER::new (
2521	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2522	@_,	2706	@_,
2523	);	2707	);
2524		2708
2525	if ($self->{anim} && $self->{animspeed}) {	2709	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2710	Scalar::Util::weaken (my $widget = $self);
…		…
2552	}	2736	}
2553		2737
2554	sub _draw {	2738	sub _draw {
2555	my ($self) = @_;	2739	my ($self) = @_;
2556		2740
2557	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
2558		2742
2559	my $face;	2743	my $face;
2560		2744
2561	if ($self->{frame}) {	2745	if ($self->{frame}) {
2562	my $anim = $::CONN->{anim}[$self->{anim}];	2746	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2585	$self->SUPER::DESTROY;	2769	$self->SUPER::DESTROY;
2586	}	2770	}
2587		2771
2588	#############################################################################	2772	#############################################################################
2589		2773
2590	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2591		2775
2592	our @ISA = CFClient::UI::HBox::;	2776	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		2777
2620	sub new {	2778	sub new {
2621	my $class = shift;	2779	my $class = shift;
2622		2780
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 (	2781	my $self = $class->SUPER::new (
2630	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2631	can_events => 1,
2632	tooltip => ((CFClient::UI::Label::escape $desc)
2633	. "\n<small>leftclick - pick up\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->{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} == 2) {
2647	$::CONN->send ("apply $item->{tag}");
2648	} elsif ($ev->{button} == 3) {
2649	my @menu_items = (
2650	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653	(
2654	$item->{flags} & Crossfire::Protocol::F_LOCKED
2655	? (
2656	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657	)
2658	: (
2659	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661	)
2662	),
2663	);
2664
2665	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666	}
2667
2668	1
2669	},
2670	%args
2671	);
2672
2673
2674	$self->add (new CFClient::UI::Face
2675	can_events => 0,
2676	face => $item->{face},
2677	anim => $item->{anim},
2678	animspeed => $item->{animspeed},
2679	);
2680
2681	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683	$self->{item} = $item;
2684
2685	$self->update_item;
2686
2687	$self
2688	}
2689
2690	sub update_item {
2691	my ($self) = @_;
2692
2693	my $desc = _item_to_desc ($self->{item});
2694
2695	$self->{name_lbl}->set_text ($desc);
2696	}
2697
2698	#############################################################################
2699
2700	package CFClient::UI::Inventory;
2701
2702	our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704	sub new {
2705	my $class = shift;
2706
2707	my $self = $class->SUPER::new (
2708	scrolled => (new CFClient::UI::VBox),
2709	@_,	2783	@_,
2710	);	2784	);
2711		2785
2712	$self	2786	$self
2713	}	2787	}
…		…
2723	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2724	} @$items;	2798	} @$items;
2725		2799
2726	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2727		2801
		2802	my $row = 0;
2728	for my $item (@items) {	2803	for my $item (@items) {
2729	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2804	CFClient::Item::update_widgets $item;
2730	$item->update_item ();
2731	}
2732		2805
2733	$self->{scrolled}->add (@items);	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2734		2809
2735	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2810	$row++;
2736	}	2811	}
2737
2738	sub size_request {
2739	my ($self) = @_;
2740	($self->{req_w}, $self->{req_h});
2741	}	2812	}
2742		2813
2743	#############################################################################	2814	#############################################################################
2744		2815
2745	package CFClient::UI::Menu;	2816	package CFClient::UI::Menu;
…		…
2780		2851
2781	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2782	sub popup {	2853	sub popup {
2783	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2784		2855
2785	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2786		2857
2787	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2788	$GRAB = $self;	2859	$GRAB = $self;
2789	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2790		2861
…		…
2805		2876
2806	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2807	undef $GRAB;	2878	undef $GRAB;
2808	$self->hide;	2879	$self->hide;
2809		2880
2810	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2811	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2812	}	2883	}
2813	}	2884	}
2814		2885
2815	#############################################################################	2886	#############################################################################
…		…
2877	sub add {	2948	sub add {
2878	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2879		2950
2880	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2881	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2882		2955
2883	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2884		2957
2885	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886		2959
…		…
2929	use CFClient::OpenGL;	3002	use CFClient::OpenGL;
2930		3003
2931	sub new {	3004	sub new {
2932	my $class = shift;	3005	my $class = shift;
2933		3006
2934	$class->SUPER::new (	3007	my $self = $class->SUPER::new (
		3008	visible => 1,
2935	@_,	3009	@_,
2936	)	3010	);
		3011
		3012	Scalar::Util::weaken ($self->{root} = $self);
		3013
		3014	$self
2937	}	3015	}
2938		3016
2939	sub configure {	3017	sub configure {
2940	my ($self, $x, $y, $w, $h) = @_;	3018	my ($self, $x, $y, $w, $h) = @_;
2941		3019
2942	$self->{w} = $w;	3020	$self->{w} = $w;
2943	$self->{h} = $h;	3021	$self->{h} = $h;
2944	}	3022	}
2945		3023
2946	sub check_size {	3024	sub reconfigure {
2947	my ($self) = @_;	3025	my ($self) = @_;
2948		3026
		3027	$self->SUPER::reconfigure;
		3028
2949	$self->size_allocate ($self->{w}, $self->{h})	3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
2950	if $self->{w};	3030	if $self->{w};
2951	}	3031	}
2952		3032
2953	sub size_request {	3033	sub size_request {
2954	my ($self) = @_;	3034	my ($self) = @_;
2955		3035
2956	($self->{w}, $self->{h})	3036	($self->{w}, $self->{h})
2957	}	3037	}
2958		3038
		3039	sub _to_pixel {
		3040	my ($coord, $size, $max) = @_;
		3041
		3042	$coord =
		3043	$coord eq "center" ? ($max - $size) * 0.5
		3044	: $coord eq "max" ? $max
		3045	: $coord;
		3046
		3047	$coord = 0 if $coord < 0;
		3048	$coord = $max - $size if $coord > $max - $size;
		3049
		3050	int $coord + 0.5
		3051	}
		3052
2959	sub size_allocate {	3053	sub size_allocate {
2960	my ($self, $w, $h) = @_;	3054	my ($self, $w, $h, $changed) = @_;
2961
2962	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967		3055
2968	for my $child ($self->children) {	3056	for my $child ($self->children) {
2969	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970		3058
2971	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3059	$X = $child->{force_x} if exists $child->{force_x};
2972	if exists $child->{req_x};	3060	$Y = $child->{force_y} if exists $child->{force_y};
2973		3061
2974	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3062	$X = _to_pixel $X, $W, $self->{w};
2975	if exists $child->{req_y};	3063	$Y = _to_pixel $Y, $H, $self->{h};
2976
2977	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2978	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2979		3064
2980	$child->configure ($X, $Y, $W, $H);	3065	$child->configure ($X, $Y, $W, $H);
2981	}	3066	}
2982	}	3067	}
2983		3068
…		…
2994	}	3079	}
2995		3080
2996	sub update {	3081	sub update {
2997	my ($self) = @_;	3082	my ($self) = @_;
2998		3083
2999	$self->check_size;
3000	$::WANT_REFRESH++;	3084	$::WANT_REFRESH++;
3001	}	3085	}
3002		3086
3003	sub add {	3087	sub add {
3004	my ($self, @children) = @_;	3088	my ($self, @children) = @_;
3005		3089
3006	for my $child (@children) {
3007	$child->{toplevel} = 1;	3090	$_->{is_toplevel} = 1
3008		3091	for @children;
3009	# integerise window positions
3010	$child->{x} = int $child->{x};
3011	$child->{y} = int $child->{y};
3012	}
3013		3092
3014	$self->SUPER::add (@children);	3093	$self->SUPER::add (@children);
		3094	}
		3095
		3096	sub remove {
		3097	my ($self, @children) = @_;
		3098
		3099	$self->SUPER::remove (@children);
		3100
		3101	delete $self->{is_toplevel}
		3102	for @children;
3015		3103
3016	while (@children) {	3104	while (@children) {
3017	my $w = pop @children;	3105	my $w = pop @children;
3018	push @children, $w->children;	3106	push @children, $w->children;
3019	$w->{visible} = 1;	3107	$w->set_invisible;
3020	}
3021	}
3022
3023	sub remove {
3024	my ($self, @children) = @_;
3025
3026	$self->SUPER::remove (@children);
3027
3028	while (@children) {
3029	my $w = pop @children;
3030	push @children, $w->children;
3031	delete $w->{visible};
3032	}	3108	}
3033	}	3109	}
3034		3110
3035	sub on_refresh {	3111	sub on_refresh {
3036	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
…		…
3050	while ($self->{refresh_hook}) {	3126	while ($self->{refresh_hook}) {
3051	$_->()	3127	$_->()
3052	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
3053	}	3129	}
3054		3130
3055	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
3056	my @queue = ([], []);	3132	my @queue;
3057		3133
3058	for (;;) {	3134	while () {
3059	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3060	# heuristic: check containers last	3136	#TODO use array-of-depth approach
3061	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
3062	for values %{delete $self->{check_size}}	3138	@queue = sort { $a->{visible} <=> $b->{visible} }
		3139	@queue, values %{delete $self->{realloc}};
3063	}	3140	}
3064		3141
3065	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
3066		3143
		3144	$widget->{visible} or last; # do not resize invisible widgets
		3145
3067	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3068	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(force_w force_h)}
3069	: $widget->size_request;	3148	: $widget->size_request;
3070		3149
3071	if (delete $widget->{force_alloc}	3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3072	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3151
3073	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3152	$w = $min_size if $w < $min_size;
3074		3153	$h = $min_size if $h < $min_size;
		3154
3075	$widget->{req_w} = $w;	3155	$widget->{req_w} = $w;
3076	$widget->{req_h} = $h;	3156	$widget->{req_h} = $h;
3077		3157
3078	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3079		3159
3080	$widget->{parent}->check_size	3160	push @queue, $widget->{parent}
3081	if $widget->{parent};	3161	if $widget->{parent};
3082	}
3083	}	3162	}
3084	}	3163	}
3085		3164
3086	while ($self->{size_alloc}) {	3165	while (my $size_alloc = delete $self->{size_alloc}) {
3087	for (values %{delete $self->{size_alloc}}) {	3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3088	my ($widget, $w, $h) = @$_;	3167	values %$size_alloc;
		3168
		3169	while () {
		3170	my ($widget, $w, $h) = @{ pop @queue or last };
		3171
		3172	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3173	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3089		3174
3090	$w = 0 if $w < 0;	3175	$w = 0 if $w < 0;
3091	$h = 0 if $h < 0;	3176	$h = 0 if $h < 0;
3092		3177
		3178	$w = int $w + 0.5;
		3179	$h = int $h + 0.5;
		3180
		3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3182
3093	$widget->{w} = $w;	3183	$widget->{w} = $w;
3094	$widget->{h} = $h;	3184	$widget->{h} = $h;
3095	$widget->size_allocate ($w, $h);	3185
3096	$widget->emit (size_allocate => $w, $h);	3186	$widget->emit (size_allocate => $w, $h, $changed);
3097	}	3187	}
3098	}	3188	}
3099		3189
3100	while ($self->{post_alloc_hook}) {	3190	while ($self->{post_alloc_hook}) {
3101	$_->()	3191	$_->()

Diff Legend

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