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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22: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	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) = @_;
…		…
212	return if $self->{parent};	243	return if $self->{parent};
213		244
214	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
215	}	246	}
216		247
217	sub hide {	248	sub set_visible {
218	my ($self) = @_;	249	my ($self) = @_;
		250
		251	return if $self->{visible};
		252
		253	$self->{root} = $self->{parent}{root};
		254	$self->{visible} = $self->{parent}{visible} + 1;
		255
		256	$self->emit (visibility_change => 1);
		257
		258	$self->realloc if !exists $self->{req_w};
		259
		260	$_->set_visible for $self->children;
		261	}
		262
		263	sub set_invisible {
		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};
219		272
220	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
221	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
222		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
223	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
224	if $self->{parent};	307	if $self->{parent};
225	}	308	}
226		309
227	sub move {	310	sub move_abs {
228	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
229		312
230	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
231	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
232	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
233		316
234	$self->update;	317	$self->update;
235	}	318	}
236		319
237	sub set_size {	320	sub set_size {
238	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
239		322
240	$self->{user_w} = $w;	323	$self->{force_w} = $w;
241	$self->{user_h} = $h;	324	$self->{force_h} = $h;
242		325
243	$self->check_size;	326	$self->realloc;
244	}	327	}
245		328
246	sub size_request {	329	sub size_request {
247	require Carp;	330	require Carp;
248	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
250		333
251	sub configure {	334	sub configure {
252	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
253		336
254	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
255	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
256	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
257		342
258	# use alignment to adjust x, y	343	# use alignment to adjust x, y
259		344
260	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
261	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
262
263	($w, $h) = ($w2, $h2);
264	}	347	}
265		348
266	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
267	$self->{x} = $x;	350	$self->{x} = $x;
268	$self->{y} = $y;	351	$self->{y} = $y;
269	$self->update;	352	$self->update;
270	}	353	}
271		354
272	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
		356	return unless $self->{visible};
		357
273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
274	}	359	}
275	}	360	}
276		361
277	sub size_allocate {	362	sub size_allocate {
278	# nothing to be done	363	# nothing to be done
279	}	364	}
280		365
281	sub reconfigure {
282	my ($self) = @_;
283
284	$self->check_size (1);
285	$self->update;
286	}
287
288	sub children {	366	sub children {
289	}	367	}
290		368
291	sub set_max_size {	369	sub set_max_size {
292	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
…		…
295	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
296	}	374	}
297		375
298	sub set_tooltip {	376	sub set_tooltip {
299	my ($self, $tooltip) = @_;	377	my ($self, $tooltip) = @_;
		378
		379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
300		383
301	$self->{tooltip} = $tooltip;	384	$self->{tooltip} = $tooltip;
302		385
303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304	delete $CFClient::UI::TOOLTIP->{owner};	387	delete $CFClient::UI::TOOLTIP->{owner};
…		…
326	return if $FOCUS == $self;	409	return if $FOCUS == $self;
327	return unless $self->{can_focus};	410	return unless $self->{can_focus};
328		411
329	my $focus = $FOCUS; $FOCUS = $self;	412	my $focus = $FOCUS; $FOCUS = $self;
330		413
331	$self->emit (focus_in => $focus);	414	$self->_emit (focus_in => $focus);
332		415
333	$focus->update if $focus;	416	$focus->update if $focus;
334	$FOCUS->update;	417	$FOCUS->update;
335	}	418	}
336		419
…		…
339		422
340	return unless $FOCUS == $self;	423	return unless $FOCUS == $self;
341		424
342	my $focus = $FOCUS; undef $FOCUS;	425	my $focus = $FOCUS; undef $FOCUS;
343		426
344	$self->emit (focus_out => $focus);	427	$self->_emit (focus_out => $focus);
345		428
346	$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;
347	}	433	}
348		434
349	sub mouse_motion { }	435	sub mouse_motion { }
350	sub button_up { }	436	sub button_up { }
351	sub key_down { }	437	sub key_down { }
352	sub key_up { }	438	sub key_up { }
353		439
354	sub button_down {	440	sub button_down {
355	my ($self, $ev, $x, $y) = @_;	441	my ($self, $ev, $x, $y) = @_;
356		442
357	$self->focus_in;	443	$self->focus_in;
…		…
360	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
361	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
362	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
363	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
364	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	}
365		521
366	sub draw {	522	sub draw {
367	my ($self) = @_;	523	my ($self) = @_;
368		524
369	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
386	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
387	glEnd;	543	glEnd;
388	glDisable GL_BLEND;	544	glDisable GL_BLEND;
389	}	545	}
390		546
391	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
392	glPushMatrix;	548	glPushMatrix;
393	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
394	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
396	glVertex 0 , 0;	552	glVertex 0 , 0;
397	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
398	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
399	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
400	glEnd;	556	glEnd;
401	glPopMatrix;	557	glPopMatrix;
402	#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;
403	}	559	}
404	}	560	}
405		561
406	sub _draw {	562	sub _draw {
407	my ($self) = @_;	563	my ($self) = @_;
408		564
409	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
410	}
411
412	sub find_widget {
413	my ($self, $x, $y) = @_;
414
415	return () unless $self->{can_events};
416
417	return $self
418	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421	()
422	}
423
424	sub set_parent {
425	my ($self, $parent) = @_;
426
427	Scalar::Util::weaken ($self->{parent} = $parent);
428
429	# TODO: req_w _does_change after ->reconfigure
430	$self->check_size
431	unless exists $self->{req_w};
432	}
433
434	sub check_size {
435	my ($self, $forced) = @_;
436
437	$self->{force_alloc} = 1 if $forced;
438	$CFClient::UI::ROOT->{check_size}{$self} = $self;
439	}
440
441	sub update {
442	my ($self) = @_;
443
444	$self->{parent}->update
445	if $self->{parent};
446	}
447
448	sub connect {
449	my ($self, $signal, $cb) = @_;
450
451	push @{ $self->{signal_cb}{$signal} }, $cb;
452	}
453
454	sub emit {
455	my ($self, $signal, @args) = @_;
456
457	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458	}	566	}
459		567
460	sub DESTROY {	568	sub DESTROY {
461	my ($self) = @_;	569	my ($self) = @_;
462		570
…		…
520	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
521	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
522	}	630	}
523		631
524	sub size_request {	632	sub size_request {
525	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
526	}	636	}
527		637
528	sub draw { }	638	sub draw { }
529		639
530	#############################################################################	640	#############################################################################
…		…
559	$self->{children} = [	669	$self->{children} = [
560	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
561	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
562	];	672	];
563		673
564	$self->check_size (1);	674	$self->realloc;
565	$self->update;
566	}	675	}
567		676
568	sub children {	677	sub children {
569	@{ $_[0]{children} }	678	@{ $_[0]{children} }
570	}	679	}
…		…
575	delete $child->{parent};	684	delete $child->{parent};
576	$child->hide;	685	$child->hide;
577		686
578	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579		688
580	$self->check_size;	689	$self->realloc;
581	$self->update;
582	}	690	}
583		691
584	sub clear {	692	sub clear {
585	my ($self) = @_;	693	my ($self) = @_;
586		694
…		…
590	for (@$children) {	698	for (@$children) {
591	delete $_->{parent};	699	delete $_->{parent};
592	$_->hide;	700	$_->hide;
593	}	701	}
594		702
595	$self->check_size;	703	$self->realloc;
596	$self->update;
597	}	704	}
598		705
599	sub find_widget {	706	sub find_widget {
600	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
601		708
…		…
654	sub size_request {	761	sub size_request {
655	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
656	}	763	}
657		764
658	sub size_allocate {	765	sub size_allocate {
659	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
660		767
661	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
662	}	769	}
663		770
664	#############################################################################	771	#############################################################################
…		…
681	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
682	$self->SUPER::update;	789	$self->SUPER::update;
683	}	790	}
684		791
685	sub size_allocate {	792	sub size_allocate {
686	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
687		794
688	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
689	$self->update;	796	$self->update
		797	if $changed;
690	}	798	}
691		799
692	sub _render {	800	sub _render {
693	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
694	}	802	}
…		…
725		833
726	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
727		835
728	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
729		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
730	sub size_request {	848	sub size_request {
731	my ($self) = @_;	849	my ($self) = @_;
732		850
733	@$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)};
734	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
735		852
736	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
737	}	857	}
738		858
739	sub size_allocate {	859	sub size_allocate {
740	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
741		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);
742	$self->update;	866	$self->update;
743	}	867	}
744		868
745	sub set_offset {	869	sub set_offset {
746	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
797	my $class = shift;	921	my $class = shift;
798		922
799	my $self;	923	my $self;
800		924
801	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
802	vertical => 1,	926	vertical => 1,
803	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
804	connect_changed => sub {	928	on_changed => sub {
805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	929	$self->{vp}->set_offset (0, $_[1]);
806	},	930	},
807	;	931	;
808		932
809	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
810	vp => (new CFClient::UI::ViewPort expand => 1),	934	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
815	$self->{vp}->add ($self->{scrolled});	939	$self->{vp}->add ($self->{scrolled});
816	$self->add ($self->{vp});	940	$self->add ($self->{vp});
817	$self->add ($self->{slider});	941	$self->add ($self->{slider});
818		942
819	$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]);
820	}	963	}
821		964
822	#TODO# update range on size_allocate depending on child	965	#TODO# update range on size_allocate depending on child
823	# update viewport offset on scroll	966	# update viewport offset on scroll
824		967
…		…
868		1011
869	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
870		1013
871	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
872		1015
873	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 =
874	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875	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);
876		1023
877	sub new {	1024	sub new {
878	my $class = shift;	1025	my $class = shift;
879		1026
880	# TODO: user_x, user_y, overwrite moveto?
881
882	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
883	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
884	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
885	border => 0.6,	1030	border => 0.6,
886	toplevel => 1,
887	can_events => 1,	1031	can_events => 1,
888	@_	1032	@_
889	);	1033	);
890		1034
891	$self->{title} &&= new CFClient::UI::Label	1035	$self->{title} &&= new CFClient::UI::Label
892	align => 0,	1036	align => 0,
…		…
911	$h + $self->border * 2,	1055	$h + $self->border * 2,
912	)	1056	)
913	}	1057	}
914		1058
915	sub size_allocate {	1059	sub size_allocate {
916	my ($self, $w, $h) = @_;	1060	my ($self, $w, $h, $changed) = @_;
		1061
		1062	return unless $changed;
917		1063
918	$h -= List::Util::max 0, $self->border * 2;	1064	$h -= List::Util::max 0, $self->border * 2;
919	$w -= List::Util::max 0, $self->border * 2;	1065	$w -= List::Util::max 0, $self->border * 2;
920		1066
921	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
945	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
946		1092
947	my $dx = $ev->{x} - $ox;	1093	my $dx = $ev->{x} - $ox;
948	my $dy = $ev->{y} - $oy;	1094	my $dy = $ev->{y} - $oy;
949		1095
950	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1098
		1099	$self->realloc;
952	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953	$self->check_size;
954	};	1101	};
955		1102
956	} elsif ($lr ^ $td) {	1103	} elsif ($lr ^ $td) {
957	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});
958	my ($bx, $by) = ($self->{x}, $self->{y});	1105	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
960	$self->{motion} = sub {	1107	$self->{motion} = sub {
961	my ($ev, $x, $y) = @_;	1108	my ($ev, $x, $y) = @_;
962		1109
963	($x, $y) = ($ev->{x}, $ev->{y});	1110	($x, $y) = ($ev->{x}, $ev->{y});
964		1111
965	$self->move ($bx + $x - $ox, $by + $y - $oy);	1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966	$self->update;
967	};	1113	};
968	}	1114	}
969	}	1115	}
970		1116
971	sub button_up {	1117	sub button_up {
…		…
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991		1137
992	my $border = $self->border;	1138	my $border = $self->border;
993		1139
994	glColor @{ $self->{border_bg} };	1140	glColor @{ $self->{border_bg} };
995	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1141	$border[0]->draw_quad_alpha (0, 0, $w, $border);
996	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1142	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
997	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1143	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1144	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999		1145
1000	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1146	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001	my $bg = $tex[0];	1147	glColor @{ $self->{bg} };
1002		1148
1003	# TODO: repeat texture not scale	1149	# TODO: repeat texture not scale
		1150	# solve this better(?)
1004	my $rep_x = $cw / $bg->{w};	1151	$bg->{s} = $cw / $bg->{w};
1005	my $rep_y = $ch / $bg->{h};	1152	$bg->{t} = $ch / $bg->{h};
1006
1007	glColor @{ $self->{bg} };
1008
1009	$bg->{s} = $rep_x;
1010	$bg->{t} = $rep_y;
1011	$bg->{wrap_mode} = 1;
1012	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013	}	1154	}
1014		1155
1015	glDisable GL_TEXTURE_2D;	1156	glDisable GL_TEXTURE_2D;
1016		1157
…		…
1032	sub new {	1173	sub new {
1033	my $class = shift;	1174	my $class = shift;
1034		1175
1035	$class->SUPER::new (	1176	$class->SUPER::new (
1036	col_expand => [],	1177	col_expand => [],
1037	@_	1178	@_,
1038	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039	}	1184	}
1040		1185
1041	sub add {	1186	sub add {
1042	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1043		1188
1044	$child->set_parent ($self);	1189	$child->set_parent ($self);
1045	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1046		1191
1047	$child->check_size;	1192	$self->realloc;
1048	}	1193	}
1049		1194
1050	sub children {
1051	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052	}
1053
1054	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1055	sub clear {	1196	sub clear {
1056	my ($self) = @_;	1197	my ($self) = @_;
1057		1198
1058	my @children = $self->children;	1199	my @children = $self->children;
1059	delete $self->{children};	1200	delete $self->{children};
…		…
1061	for (@children) {	1202	for (@children) {
1062	delete $_->{parent};	1203	delete $_->{parent};
1063	$_->hide;	1204	$_->hide;
1064	}	1205	}
1065		1206
1066	$self->update;	1207	$self->realloc;
1067	}	1208	}
1068		1209
1069	sub get_wh {	1210	sub get_wh {
1070	my ($self) = @_;	1211	my ($self) = @_;
1071		1212
…		…
1098	(sum @$hs),	1239	(sum @$hs),
1099	)	1240	)
1100	}	1241	}
1101		1242
1102	sub size_allocate {	1243	sub size_allocate {
1103	my ($self, $w, $h) = @_;	1244	my ($self, $w, $h, $changed) = @_;
1104		1245
1105	my ($ws, $hs) = $self->get_wh;	1246	my ($ws, $hs) = $self->get_wh;
1106		1247
1107	my $req_w = sum @$ws;	1248	my $req_w = (sum @$ws) || 1;
1108	my $req_h = sum @$hs;	1249	my $req_h = (sum @$hs) || 1;
1109		1250
1110	# TODO: nicer code && do row_expand	1251	# TODO: nicer code && do row_expand
1111	my @col_expand = @{$self->{col_expand}};	1252	my @col_expand = @{$self->{col_expand}};
1112	@col_expand = (1) x @$ws unless @col_expand;	1253	@col_expand = (1) x @$ws unless @col_expand;
1113	my $col_expand = (sum @col_expand) || 1;	1254	my $col_expand = (sum @col_expand) || 1;
…		…
1167	}	1308	}
1168	}	1309	}
1169		1310
1170	#############################################################################	1311	#############################################################################
1171		1312
		1313	package CFClient::UI::Box;
		1314
		1315	our @ISA = CFClient::UI::Container::;
		1316
		1317	sub size_request {
		1318	my ($self) = @_;
		1319
		1320	$self->{vertical}
		1321	? (
		1322	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	: (
		1326	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1328	)
		1329	}
		1330
		1331	sub size_allocate {
		1332	my ($self, $w, $h, $changed) = @_;
		1333
		1334	my $space = $self->{vertical} ? $h : $w;
		1335	my $children = $self->{children};
		1336
		1337	my @req;
		1338
		1339	if ($self->{homogeneous}) {
		1340	@req = ($space / (@$children || 1)) x @$children;
		1341	} else {
		1342	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1343	my $req = List::Util::sum @req;
		1344
		1345	if ($req > $space) {
		1346	# ah well, not enough space
		1347	$_ *= $space / $req for @req;
		1348	} else {
		1349	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1350
		1351	$space = ($space - $req) / $expand; # remaining space to give away
		1352
		1353	$req[$_] += $space * $children->[$_]{expand}
		1354	for 0 .. $#$children;
		1355	}
		1356	}
		1357
		1358	CFClient::UI::harmonize \@req;
		1359
		1360	my $pos = 0;
		1361	for (0 .. $#$children) {
		1362	my $alloc = $req[$_];
		1363	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1364
		1365	$pos += $alloc;
		1366	}
		1367
		1368	1
		1369	}
		1370
		1371	#############################################################################
		1372
1172	package CFClient::UI::HBox;	1373	package CFClient::UI::HBox;
1173		1374
1174	# TODO: wrap into common Box base class
1175
1176	our @ISA = CFClient::UI::Container::;	1375	our @ISA = CFClient::UI::Box::;
1177		1376
1178	sub size_request {	1377	sub new {
1179	my ($self) = @_;	1378	my $class = shift;
1180		1379
1181	my @alloc = map [$_->size_request], @{$self->{children}};	1380	$class->SUPER::new (
1182		1381	vertical => 0,
1183	(	1382	@_,
1184	(List::Util::sum map $_->[0], @alloc),
1185	(List::Util::max map $_->[1], @alloc),
1186	)	1383	)
1187	}	1384	}
1188		1385
1189	sub size_allocate {
1190	my ($self, $w, $h) = @_;
1191
1192	($h, $w) = ($w, $h);
1193
1194	my $children = $self->{children};
1195
1196	my @h = map $_->{req_w}, @$children;
1197
1198	my $req_h = List::Util::sum @h;
1199
1200	if ($req_h > $h) {
1201	# ah well, not enough space
1202	$_ *= $h / $req_h for @h;
1203	} else {
1204	my $exp = List::Util::sum map $_->{expand}, @$children;
1205	$exp ||= 1;
1206
1207	for (0 .. $#$children) {
1208	my $child = $children->[$_];
1209
1210	my $alloc_h = $h[$_];
1211	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212	$h[$_] = $alloc_h;
1213	}
1214	}
1215
1216	CFClient::UI::harmonize \@h;
1217
1218	my $y = 0;
1219	for (0 .. $#$children) {
1220	my $child = $children->[$_];
1221	my $h = $h[$_];
1222	$child->configure ($y, 0, $h, $w);
1223
1224	$y += $h;
1225	}
1226
1227	1
1228	}
1229
1230	#############################################################################	1386	#############################################################################
1231		1387
1232	package CFClient::UI::VBox;	1388	package CFClient::UI::VBox;
1233		1389
1234	# TODO: wrap into common Box base class
1235
1236	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Box::;
1237		1391
1238	sub size_request {	1392	sub new {
1239	my ($self) = @_;	1393	my $class = shift;
1240		1394
1241	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$class->SUPER::new (
1242		1396	vertical => 1,
1243	(	1397	@_,
1244	(List::Util::max map $_->[0], @alloc),
1245	(List::Util::sum map $_->[1], @alloc),
1246	)	1398	)
1247	}
1248
1249	sub size_allocate {
1250	my ($self, $w, $h) = @_;
1251
1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254	my $children = $self->{children};
1255
1256	my @h = map $_->{req_h}, @$children;
1257
1258	my $req_h = List::Util::sum @h;
1259
1260	if ($req_h > $h) {
1261	# ah well, not enough space
1262	$_ *= $h / $req_h for @h;
1263	} else {
1264	my $exp = List::Util::sum map $_->{expand}, @$children;
1265	$exp ||= 1;
1266
1267	for (0 .. $#$children) {
1268	my $child = $children->[$_];
1269
1270	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271	}
1272	}
1273
1274	CFClient::UI::harmonize \@h;
1275
1276	my $y = 0;
1277	for (0 .. $#$children) {
1278	my $child = $children->[$_];
1279	my $h = $h[$_];
1280	$child->configure (0, $y, $w, $h);
1281
1282	$y += $h;
1283	}
1284
1285	1
1286	}	1399	}
1287		1400
1288	#############################################################################	1401	#############################################################################
1289		1402
1290	package CFClient::UI::Label;	1403	package CFClient::UI::Label;
…		…
1353	$self->{text} = "T$text";	1466	$self->{text} = "T$text";
1354		1467
1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356	$self->{layout}->set_text ($text);	1469	$self->{layout}->set_text ($text);
1357		1470
		1471	$self->realloc;
1358	$self->update;	1472	$self->update;
1359	$self->check_size;
1360	}	1473	}
1361		1474
1362	sub set_markup {	1475	sub set_markup {
1363	my ($self, $markup) = @_;	1476	my ($self, $markup) = @_;
1364		1477
…		…
1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369		1482
1370	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1483	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371	$self->{layout}->set_markup ($markup);	1484	$self->{layout}->set_markup ($markup);
1372		1485
		1486	$self->realloc;
1373	$self->update;	1487	$self->update;
1374	$self->check_size;
1375	}	1488	}
1376		1489
1377	sub size_request {	1490	sub size_request {
1378	my ($self) = @_;	1491	my ($self) = @_;
1379		1492
…		…
1400	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1401	)	1514	)
1402	}	1515	}
1403		1516
1404	sub size_allocate {	1517	sub size_allocate {
1405	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1406		1519
1407	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1408	}	1522	}
1409		1523
1410	sub set_fontsize {	1524	sub set_fontsize {
1411	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1412		1526
1413	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1414	delete $self->{texture};	1528	delete $self->{texture};
1415		1529
1416	$self->update;	1530	$self->realloc;
1417	$self->check_size;
1418	}	1531	}
1419		1532
1420	sub _draw {	1533	sub _draw {
1421	my ($self) = @_;	1534	my ($self) = @_;
1422		1535
…		…
1474	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1475	can_hover => 1,	1588	can_hover => 1,
1476	can_focus => 1,	1589	can_focus => 1,
1477	valign => 0,	1590	valign => 0,
1478	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1479	@_	1593	@_
1480	)	1594	)
1481	}	1595	}
1482		1596
1483	sub _set_text {	1597	sub _set_text {
…		…
1493	$self->{text} = $text;	1607	$self->{text} = $text;
1494		1608
1495	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1496	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1497		1611
1498	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1499	}	1613	}
1500		1614
1501	sub set_text {	1615	sub set_text {
1502	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1503		1617
1504	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1505	$self->_set_text ($text);	1619	$self->_set_text ($text);
1506	$self->update;	1620
1507	$self->check_size;	1621	$self->realloc;
1508	}	1622	}
1509		1623
1510	sub get_text {	1624	sub get_text {
1511	$_[0]{text}	1625	$_[0]{text}
1512	}	1626	}
…		…
1515	my ($self) = @_;	1629	my ($self) = @_;
1516		1630
1517	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1518		1632
1519	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1520	}
1521
1522	sub size_allocate {
1523	my ($self, $w, $h) = @_;
1524
1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526	}	1634	}
1527		1635
1528	sub key_down {	1636	sub key_down {
1529	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1530		1638
…		…
1545	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1546	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1547	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1548	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1549	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1550	$self->emit ('escape');	1658	$self->_emit ('escape');
1551	} elsif ($uni) {	1659	} elsif ($uni) {
1552	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1553	}	1661	}
1554		1662
1555	$self->_set_text ($text);	1663	$self->_set_text ($text);
1556	$self->update;	1664
1557	$self->check_size;	1665	$self->realloc;
1558	}	1666	}
1559		1667
1560	sub focus_in {	1668	sub focus_in {
1561	my ($self) = @_;	1669	my ($self) = @_;
1562		1670
…		…
1642	if ($sym == 13) {	1750	if ($sym == 13) {
1643	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1644	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1645	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1646	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1647	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1648	$self->update;	1756	$self->update;
1649		1757
1650	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1651	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1652	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1700	can_events => 1,	1808	can_events => 1,
1701	@_	1809	@_
1702	)	1810	)
1703	}	1811	}
1704		1812
		1813	sub activate { }
		1814
1705	sub button_up {	1815	sub button_up {
1706	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1707		1817
		1818	$self->emit ("activate")
1708	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1709	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1710	$self->emit ("activate");
1711	}
1712	}	1821	}
1713		1822
1714	sub _draw {	1823	sub _draw {
1715	my ($self) = @_;	1824	my ($self) = @_;
1716		1825
…		…
1768	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1769		1878
1770	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1773	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1774	}	1883	}
1775	}	1884	}
1776		1885
1777	sub _draw {	1886	sub _draw {
1778	my ($self) = @_;	1887	my ($self) = @_;
…		…
2053	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
2054	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2055	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
2056	bg => [0, 0, 0, 0.2],	2165	bg => [0, 0, 0, 0.2],
2057	active_bg => [1, 1, 1, 0.5],	2166	active_bg => [1, 1, 1, 0.5],
2058	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
2059	req_w => $::WIDTH / 80,	2168	min_w => $::WIDTH / 80,
2060	req_h => $::WIDTH / 80,	2169	min_h => $::WIDTH / 80,
2061	vertical => 0,	2170	vertical => 0,
2062	can_hover => 1,	2171	can_hover => 1,
2063	inner_pad => 0.02,	2172	inner_pad => 0.02,
2064	@_	2173	@_
2065	);	2174	);
…		…
2068	$self->update;	2177	$self->update;
2069		2178
2070	$self	2179	$self
2071	}	2180	}
2072		2181
		2182	sub changed { }
		2183
		2184	sub set_range {
		2185	my ($self, $range) = @_;
		2186
		2187	($range, $self->{range}) = ($self->{range}, $range);
		2188
		2189	$self->update
		2190	if "@$range" ne "@{$self->{range}}";
		2191	}
		2192
2073	sub set_value {	2193	sub set_value {
2074	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2075		2195
2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077		2197
2078	$hi = $lo + 1 if $hi <= $lo;	2198	$hi = $lo + 1 if $hi <= $lo;
2079		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
2080	$value = $lo if $value < $lo;	2202	$value = $lo if $value < $lo;
2081	$value = $hi if $value > $hi;	2203	$value = $hi - $page if $value > $hi - $page;
2082		2204
2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084	if $unit;	2206	if $unit;
2085		2207
2086	$page = $hi - $lo if $page > $hi - $lo;
2087
2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089		2209
2090	if ($value != $old_value) {	2210	if ($value != $old_value) {
2091	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2092	$self->update;	2212	$self->update;
2093	}	2213	}
2094	}	2214	}
2095		2215
2096	sub size_request {	2216	sub size_request {
2097	my ($self) = @_;	2217	my ($self) = @_;
2098		2218
2099	my $w = $self->{req_w};	2219	($self->{req_w}, $self->{req_h})
2100	my $h = $self->{req_h};
2101
2102	$self->{vertical} ? ($h, $w) : ($w, $h)
2103	}	2220	}
2104		2221
2105	sub button_down {	2222	sub button_down {
2106	my ($self, $ev, $x, $y) = @_;	2223	my ($self, $ev, $x, $y) = @_;
2107		2224
2108	$self->SUPER::button_down ($ev, $x, $y);	2225	$self->SUPER::button_down ($ev, $x, $y);
		2226
		2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2228
2109	$self->mouse_motion ($ev, $x, $y);	2229	$self->mouse_motion ($ev, $x, $y);
2110	}	2230	}
2111		2231
2112	sub mouse_motion {	2232	sub mouse_motion {
2113	my ($self, $ev, $x, $y) = @_;	2233	my ($self, $ev, $x, $y) = @_;
…		…
2115	if ($GRAB == $self) {	2235	if ($GRAB == $self) {
2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2236	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117		2237
2118	my (undef, $lo, $hi, $page) = @{$self->{range}};	2238	my (undef, $lo, $hi, $page) = @{$self->{range}};
2119		2239
2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121		2241
2122	$self->set_value ($x * ($hi - $lo) + $lo);	2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123	}	2243	}
2124	}	2244	}
2125		2245
2126	sub update {	2246	sub update {
2127	my ($self) = @_;	2247	my ($self) = @_;
2128		2248
2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130	$self->set_value ($self->{range}[0]);	2250	$self->set_value ($self->{range}[0]);
2131		2251
2132	my ($value, $lo, $hi, $page) = @{$self->{range}};	2252	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2253	my $range = ($hi - $page - $lo) || 1e-100;
2133		2254
2134	my $inner_w = 1 - 2 * $self->{inner_pad};	2255	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135		2256
2136	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2257	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2258	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137		2259
2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2260	$value = ($value - $lo) / $range;
2139	$value = $self->{scale} * ($value - $lo);	2261	$value = $value * $self->{scale} + $self->{offset};
2140		2262
2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143	$value = 0 if $value < 0;
2144	$page = 1 - $value if $value + $page > 1;
2145
2146	$self->{knob_x} = $value;	2263	$self->{knob_x} = $value - $knob_w * 0.5;
2147	$self->{knob_w} = $page;	2264	$self->{knob_w} = $knob_w;
2148	});	2265	});
2149		2266
2150	$self->SUPER::update;	2267	$self->SUPER::update;
2151	}	2268	}
2152		2269
…		…
2176	# draw handle	2293	# draw handle
2177	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2294	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178		2295
2179	glDisable GL_TEXTURE_2D;	2296	glDisable GL_TEXTURE_2D;
2180	}	2297	}
		2298
		2299	#############################################################################
		2300
		2301	package CFClient::UI::ValSlider;
		2302
		2303	our @ISA = CFClient::UI::HBox::;
		2304
		2305	sub new {
		2306	my ($class, %arg) = @_;
		2307
		2308	my $range = delete $arg{range};
		2309
		2310	my $self = $class->SUPER::new (
		2311	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2312	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2313	to_value => sub { shift },
		2314	from_value => sub { shift },
		2315	%arg,
		2316	);
		2317
		2318	$self->{slider}->connect (changed => sub {
		2319	my ($self, $value) = @_;
		2320	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2321	$self->{parent}->emit (changed => $value);
		2322	});
		2323
		2324	# $self->{entry}->connect (changed => sub {
		2325	# my ($self, $value) = @_;
		2326	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2327	# $self->{parent}->emit (changed => $value);
		2328	# });
		2329
		2330	$self->add ($self->{slider}, $self->{entry});
		2331
		2332	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2333
		2334	$self
		2335	}
		2336
		2337	sub set_range { shift->{slider}->set_range (@_) }
		2338	sub set_value { shift->{slider}->set_value (@_) }
2181		2339
2182	#############################################################################	2340	#############################################################################
2183		2341
2184	package CFClient::UI::TextView;	2342	package CFClient::UI::TextView;
2185		2343
…		…
2216	$self->{fontsize} = $fontsize;	2374	$self->{fontsize} = $fontsize;
2217	$self->reflow;	2375	$self->reflow;
2218	}	2376	}
2219		2377
2220	sub size_allocate {	2378	sub size_allocate {
2221	my ($self, $w, $h) = @_;	2379	my ($self, $w, $h, $changed) = @_;
2222		2380
2223	$self->SUPER::size_allocate ($w, $h);	2381	$self->SUPER::size_allocate ($w, $h, $changed);
		2382
		2383	return unless $changed;
2224		2384
2225	$self->{layout}->set_font ($self->{font}) if $self->{font};	2385	$self->{layout}->set_font ($self->{font}) if $self->{font};
2226	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2228		2388
2229	$self->reflow;	2389	$self->reflow;
2230	}	2390	}
2231		2391
2232	sub text_height {	2392	sub text_size {
2233	my ($self, $text, $indent) = @_;	2393	my ($self, $text, $indent) = @_;
2234		2394
2235	my $layout = $self->{layout};	2395	my $layout = $self->{layout};
2236		2396
2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$layout->set_width ($self->{children}[0]{w} - $indent);	2398	$layout->set_width ($self->{children}[0]{w} - $indent);
2239	$layout->set_markup ($text);	2399	$layout->set_markup ($text);
2240		2400
2241	($layout->size)[1]	2401	$layout->size
2242	}	2402	}
2243		2403
2244	sub reflow {	2404	sub reflow {
2245	my ($self) = @_;	2405	my ($self) = @_;
2246		2406
2247	$self->{need_reflow}++;	2407	$self->{need_reflow}++;
2248	$self->update;	2408	$self->update;
2249	}	2409	}
2250		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2251	sub add_paragraph {	2426	sub add_paragraph {
2252	my ($self, $color, $text, $indent) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2253		2428
2254	#TODO: intelligently "reformat" paragraph
2255
2256	for my $line (split /\n/, $text) {	2429	for my $line (split /\n/, $text) {
2257	my $height = $self->text_height ($line);	2430	my ($w, $h) = $self->text_size ($line);
2258	$self->{height} += $height;	2431	$self->{height} += $h;
2259	push @{$self->{par}}, [$height, $color, $indent, $line];	2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260	}	2433	}
2261		2434
2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263	$self->{children}[1]->update;
2264	}	2436	}
2265		2437
2266	sub update {	2438	sub update {
2267	my ($self) = @_;	2439	my ($self) = @_;
2268		2440
…		…
2271	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2272		2444
2273	delete $self->{texture};	2445	delete $self->{texture};
2274		2446
2275	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2276	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2277	my $height = 0;	2451	my $height = 0;
2278		2452
2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2280	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2281		2468
2282	$self->{height} = $height;	2469	$self->{height} = $height;
2283		2470
2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285	$self->{children}[1]->update;
2286		2472
2287	delete $self->{texture};	2473	delete $self->{texture};
2288	}	2474	}
2289		2475
2290	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291	glClearColor 0.5, 0.5, 0.5, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2292	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2293		2479
2294	my $top = int $self->{children}[1]{range}[0];	2480	my $top = int $self->{children}[1]{range}[0];
2295		2481
2296	my $y0 = $top;	2482	my $y0 = $top;
2297	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2298		2484
2299	my $y = 0;	2485	my $y = 0;
2300		2486
2301	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2302		2488
2303	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2304		2490
2305	glEnable GL_BLEND;	2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307		2494
2308	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2309	my $h = $par->[0];	2496	my $h = $par->[1];
2310		2497
2311	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2312	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
2313	$layout->set_width ($self->{w} - $par->[2]);	2500	$layout->set_width ($W - $par->[3]);
2314	$layout->set_markup ($par->[3]);	2501	$layout->set_markup ($par->[4]);
2315		2502
2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317		2504
2318	glRasterPos $par->[2], $y - $y0;	2505	glRasterPos $par->[3], $y - $y0;
2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320	}	2507	}
2321		2508
2322	$y += $h;	2509	$y += $h;
2323	}	2510	}
…		…
2390		2577
2391	sub new {	2578	sub new {
2392	my $class = shift;	2579	my $class = shift;
2393		2580
2394	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2395	state => 0,	2582	state => 0,
2396	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2397	@_	2584	@_
2398	);	2585	);
2399		2586
2400	if ($self->{state}) {
2401	$self->{state} = 0;
2402	$self->toggle_flopper;
2403	}
2404
2405	$self	2587	$self
2406	}	2588	}
2407		2589
2408	sub toggle_flopper {	2590	sub toggle_flopper {
2409	my ($self) = @_;	2591	my ($self) = @_;
2410		2592
2411	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2412	if ($self->{state} = !$self->{state}) {
2413	$CFClient::UI::ROOT->add ($self->{other});
2414	$self->{other}->move ($self->coord2global (0, $self->{h}));
2415	$self->emit ("open");
2416	} else {
2417	$CFClient::UI::ROOT->remove ($self->{other});
2418	$self->emit ("close");
2419	}
2420
2421	$self->emit (changed => $self->{state});
2422	}	2594	}
2423		2595
2424	#############################################################################	2596	#############################################################################
2425		2597
2426	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2458		2630
2459	($w + 4, $h + 4)	2631	($w + 4, $h + 4)
2460	}	2632	}
2461		2633
2462	sub size_allocate {	2634	sub size_allocate {
2463	my ($self, $w, $h) = @_;	2635	my ($self, $w, $h, $changed) = @_;
2464		2636
		2637	return unless $changed;
		2638
2465	$self->SUPER::size_allocate ($w - 4, $h - 4);	2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2640	}
		2641
		2642	sub visibility_change {
		2643	my ($self, $visible) = @_;
		2644
		2645	return unless $visible;
		2646
		2647	$self->{root}->on_post_alloc ("move_$self" => sub {
		2648	my $widget = $self->{owner}
		2649	or return;
		2650
		2651	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2652
		2653	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2654	if $x + $self->{w} > $::WIDTH;
		2655
		2656	$self->move_abs ($x, $y);
		2657	});
2466	}	2658	}
2467		2659
2468	sub _draw {	2660	sub _draw {
2469	my ($self) = @_;	2661	my ($self) = @_;
2470		2662
…		…
2487	glVertex $w, $h;	2679	glVertex $w, $h;
2488	glVertex $w, 0;	2680	glVertex $w, 0;
2489	glEnd;	2681	glEnd;
2490		2682
2491	glTranslate 2 - 0.375, 2 - 0.375;	2683	glTranslate 2 - 0.375, 2 - 0.375;
		2684
2492	$self->SUPER::_draw;	2685	$self->SUPER::_draw;
2493	}	2686	}
2494		2687
2495	#############################################################################	2688	#############################################################################
2496		2689
…		…
2502		2695
2503	sub new {	2696	sub new {
2504	my $class = shift;	2697	my $class = shift;
2505		2698
2506	my $self = $class->SUPER::new (	2699	my $self = $class->SUPER::new (
2507	aspect => 1,	2700	aspect => 1,
		2701	can_events => 0,
2508	@_,	2702	@_,
2509	);	2703	);
2510		2704
2511	if ($self->{anim} && $self->{animspeed}) {	2705	if ($self->{anim} && $self->{animspeed}) {
2512	Scalar::Util::weaken (my $widget = $self);	2706	Scalar::Util::weaken (my $widget = $self);
…		…
2527		2721
2528	sub size_request {	2722	sub size_request {
2529	(32, 8)	2723	(32, 8)
2530	}	2724	}
2531		2725
		2726	sub update {
		2727	my ($self) = @_;
		2728
		2729	return unless $self->{visible};
		2730
		2731	$self->SUPER::update;
		2732	}
		2733
2532	sub _draw {	2734	sub _draw {
2533	my ($self) = @_;	2735	my ($self) = @_;
2534		2736
2535	return unless $::CONN;#d# manage and cache textures differently	2737	return unless $::CONN;
2536		2738
2537	my $face;	2739	my $face;
2538		2740
2539	if ($self->{frame}) {	2741	if ($self->{frame}) {
2540	my $anim = $::CONN->{anim}[$self->{anim}];	2742	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2563	$self->SUPER::DESTROY;	2765	$self->SUPER::DESTROY;
2564	}	2766	}
2565		2767
2566	#############################################################################	2768	#############################################################################
2567		2769
2568	package CFClient::UI::InventoryItem;	2770	package CFClient::UI::Inventory;
2569		2771
2570	our @ISA = CFClient::UI::HBox::;	2772	our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572	sub _item_to_desc {
2573	my ($item) = @_;
2574
2575	my $desc =
2576	$item->{nrof} < 2
2577	? $item->{name}
2578	: "$item->{nrof} × $item->{name_pl}";
2579
2580	$item->{flags} & Crossfire::Protocol::F_OPEN
2581	and $desc .= " (open)";
2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
2583	and $desc .= " (applied)";
2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
2585	and $desc .= " (unpaid)";
2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
2587	and $desc .= " (magic)";
2588	$item->{flags} & Crossfire::Protocol::F_CURSED
2589	and $desc .= " (cursed)";
2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
2591	and $desc .= " (damned)";
2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
2593	and $desc .= " *";
2594
2595	$desc
2596	}
2597		2773
2598	sub new {	2774	sub new {
2599	my $class = shift;	2775	my $class = shift;
2600		2776
2601	my %args = @_;
2602
2603	my $item = delete $args{item};
2604
2605	my $desc = _item_to_desc ($item);
2606
2607	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
2608	can_hover => 1,	2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609	can_events => 1,
2610	tooltip => ((CFClient::UI::Label::escape $desc)
2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612	connect_button_down => sub {
2613	my ($self, $ev, $x, $y) = @_;
2614
2615	# todo: maybe put examine on 1? but should just be a tooltip :(
2616	if ($ev->{button} == 1) {
2617	my $targ = $::CONN->{player}{tag};
2618
2619	if ($item->{container} == $::CONN->{player}{tag}) {
2620	$targ = $main::OPENCONT;
2621	}
2622
2623	$::CONN->send ("move $targ $item->{tag} 0");
2624	} elsif ($ev->{button} == 2) {
2625	$::CONN->send ("apply $item->{tag}");
2626	} elsif ($ev->{button} == 3) {
2627	my @menu_items = (
2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631	(
2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
2633	? (
2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635	)
2636	: (
2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639	)
2640	),
2641	);
2642
2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644	}
2645
2646	1
2647	},
2648	%args
2649	);
2650
2651
2652	$self->add (new CFClient::UI::Face
2653	can_events => 0,
2654	face => $item->{face},
2655	anim => $item->{anim},
2656	animspeed => $item->{animspeed},
2657	);
2658
2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661	$self->{item} = $item;
2662
2663	$self->update_item;
2664
2665	$self
2666	}
2667
2668	sub update_item {
2669	my ($self) = @_;
2670
2671	my $desc = _item_to_desc ($self->{item});
2672
2673	$self->{name_lbl}->set_text ($desc);
2674	}
2675
2676	#############################################################################
2677
2678	package CFClient::UI::Inventory;
2679
2680	our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682	sub new {
2683	my $class = shift;
2684
2685	my $self = $class->SUPER::new (
2686	scrolled => (new CFClient::UI::VBox),
2687	@_,	2779	@_,
2688	);	2780	);
2689		2781
2690	$self	2782	$self
2691	}	2783	}
…		…
2701	or ($a->{name} cmp $b->{name})	2793	or ($a->{name} cmp $b->{name})
2702	} @$items;	2794	} @$items;
2703		2795
2704	$self->{real_items} = \@items;	2796	$self->{real_items} = \@items;
2705		2797
		2798	my $row = 0;
2706	for my $item (@items) {	2799	for my $item (@items) {
2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2800	CFClient::Item::update_widgets $item;
2708	$item->update_item ();
2709	}
2710		2801
2711	$self->{scrolled}->add (@items);	2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2712		2805
2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2806	$row++;
2714	}	2807	}
2715
2716	sub size_request {
2717	my ($self) = @_;
2718	($self->{req_w}, $self->{req_h});
2719	}	2808	}
2720		2809
2721	#############################################################################	2810	#############################################################################
2722		2811
2723	package CFClient::UI::Menu;	2812	package CFClient::UI::Menu;
…		…
2758		2847
2759	# popup given the event (must be a mouse button down event currently)	2848	# popup given the event (must be a mouse button down event currently)
2760	sub popup {	2849	sub popup {
2761	my ($self, $ev) = @_;	2850	my ($self, $ev) = @_;
2762		2851
2763	$self->emit ("popdown");	2852	$self->_emit ("popdown");
2764		2853
2765	# maybe save $GRAB? must be careful about events...	2854	# maybe save $GRAB? must be careful about events...
2766	$GRAB = $self;	2855	$GRAB = $self;
2767	$self->{button} = $ev->{button};	2856	$self->{button} = $ev->{button};
2768		2857
…		…
2783		2872
2784	if ($ev->{button} == $self->{button}) {	2873	if ($ev->{button} == $self->{button}) {
2785	undef $GRAB;	2874	undef $GRAB;
2786	$self->hide;	2875	$self->hide;
2787		2876
2788	$self->emit ("popdown");	2877	$self->_emit ("popdown");
2789	$self->{hover}[1]->() if $self->{hover};	2878	$self->{hover}[1]->() if $self->{hover};
2790	}	2879	}
2791	}	2880	}
2792		2881
2793	#############################################################################	2882	#############################################################################
…		…
2855	sub add {	2944	sub add {
2856	my ($self, $text, %arg) = @_;	2945	my ($self, $text, %arg) = @_;
2857		2946
2858	$text =~ s/^\s+//;	2947	$text =~ s/^\s+//;
2859	$text =~ s/\s+$//;	2948	$text =~ s/\s+$//;
		2949
		2950	return unless $text;
2860		2951
2861	my $timeout = time + ((delete $arg{timeout}) || 60);	2952	my $timeout = time + ((delete $arg{timeout}) || 60);
2862		2953
2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2954	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864		2955
…		…
2907	use CFClient::OpenGL;	2998	use CFClient::OpenGL;
2908		2999
2909	sub new {	3000	sub new {
2910	my $class = shift;	3001	my $class = shift;
2911		3002
2912	$class->SUPER::new (	3003	my $self = $class->SUPER::new (
		3004	visible => 1,
2913	@_,	3005	@_,
2914	)	3006	);
		3007
		3008	Scalar::Util::weaken ($self->{root} = $self);
		3009
		3010	$self
2915	}	3011	}
2916		3012
2917	sub configure {	3013	sub configure {
2918	my ($self, $x, $y, $w, $h) = @_;	3014	my ($self, $x, $y, $w, $h) = @_;
2919		3015
2920	$self->{w} = $w;	3016	$self->{w} = $w;
2921	$self->{h} = $h;	3017	$self->{h} = $h;
2922	}	3018	}
2923		3019
2924	sub check_size {	3020	sub reconfigure {
2925	my ($self) = @_;	3021	my ($self) = @_;
2926		3022
		3023	$self->SUPER::reconfigure;
		3024
2927	$self->size_allocate ($self->{w}, $self->{h})	3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
2928	if $self->{w};	3026	if $self->{w};
2929	}	3027	}
2930		3028
2931	sub size_request {	3029	sub size_request {
2932	my ($self) = @_;	3030	my ($self) = @_;
2933		3031
2934	($self->{w}, $self->{h})	3032	($self->{w}, $self->{h})
2935	}	3033	}
2936		3034
		3035	sub _to_pixel {
		3036	my ($coord, $size, $max) = @_;
		3037
		3038	$coord =
		3039	$coord eq "center" ? ($max - $size) * 0.5
		3040	: $coord eq "max" ? $max
		3041	: $coord;
		3042
		3043	$coord = 0 if $coord < 0;
		3044	$coord = $max - $size if $coord > $max - $size;
		3045
		3046	int $coord + 0.5
		3047	}
		3048
2937	sub size_allocate {	3049	sub size_allocate {
2938	my ($self, $w, $h) = @_;	3050	my ($self, $w, $h, $changed) = @_;
2939
2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945		3051
2946	for my $child ($self->children) {	3052	for my $child ($self->children) {
2947	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948		3054
2949	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3055	$X = $child->{force_x} if exists $child->{force_x};
2950	if exists $child->{req_x};	3056	$Y = $child->{force_y} if exists $child->{force_y};
2951		3057
2952	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3058	$X = _to_pixel $X, $W, $self->{w};
2953	if exists $child->{req_y};	3059	$Y = _to_pixel $Y, $H, $self->{h};
2954
2955	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957		3060
2958	$child->configure ($X, $Y, $W, $H);	3061	$child->configure ($X, $Y, $W, $H);
2959	}	3062	}
2960	}	3063	}
2961		3064
…		…
2972	}	3075	}
2973		3076
2974	sub update {	3077	sub update {
2975	my ($self) = @_;	3078	my ($self) = @_;
2976		3079
2977	$self->check_size;
2978	$::WANT_REFRESH++;	3080	$::WANT_REFRESH++;
2979	}	3081	}
2980		3082
2981	sub add {	3083	sub add {
2982	my ($self, @children) = @_;	3084	my ($self, @children) = @_;
2983		3085
2984	for my $child (@children) {
2985	$child->{toplevel} = 1;	3086	$_->{is_toplevel} = 1
2986		3087	for @children;
2987	# integerise window positions
2988	$child->{x} = int $child->{x};
2989	$child->{y} = int $child->{y};
2990	}
2991		3088
2992	$self->SUPER::add (@children);	3089	$self->SUPER::add (@children);
		3090	}
		3091
		3092	sub remove {
		3093	my ($self, @children) = @_;
		3094
		3095	$self->SUPER::remove (@children);
		3096
		3097	delete $self->{is_toplevel}
		3098	for @children;
		3099
		3100	while (@children) {
		3101	my $w = pop @children;
		3102	push @children, $w->children;
		3103	$w->set_invisible;
		3104	}
2993	}	3105	}
2994		3106
2995	sub on_refresh {	3107	sub on_refresh {
2996	my ($self, $id, $cb) = @_;	3108	my ($self, $id, $cb) = @_;
2997		3109
…		…
3010	while ($self->{refresh_hook}) {	3122	while ($self->{refresh_hook}) {
3011	$_->()	3123	$_->()
3012	for values %{delete $self->{refresh_hook}};	3124	for values %{delete $self->{refresh_hook}};
3013	}	3125	}
3014		3126
3015	if ($self->{check_size}) {	3127	if ($self->{realloc}) {
3016	my @queue = ([], []);	3128	my @queue;
3017		3129
3018	for (;;) {	3130	while () {
3019	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
3020	# heuristic: check containers last	3132	#TODO use array-of-depth approach
3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3133
3022	for values %{delete $self->{check_size}}	3134	@queue = sort { $a->{visible} <=> $b->{visible} }
		3135	@queue, values %{delete $self->{realloc}};
3023	}	3136	}
3024		3137
3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3138	my $widget = pop @queue || last;
3026		3139
3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3140	$widget->{visible} or last; # do not resize invisible widgets
3028	? @$widget{qw(user_w user_h)}	3141
3029	: $widget->size_request;	3142	my ($w, $h) = $widget->size_request;
3030		3143
3031	if (delete $widget->{force_alloc}	3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3145
3033	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
3034		3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
		3148
		3149	$w = $widget->{force_w} if exists $widget->{force_w};
		3150	$h = $widget->{force_h} if exists $widget->{force_h};
		3151
3035	$widget->{req_w} = $w;	3152	$widget->{req_w} = $w;
3036	$widget->{req_h} = $h;	3153	$widget->{req_h} = $h;
3037		3154
3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3039		3156
3040	$widget->{parent}->check_size	3157	push @queue, $widget->{parent}
3041	if $widget->{parent};	3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3042	}
3043	}	3159	}
3044	}	3160	}
3045		3161
3046	while ($self->{size_alloc}) {	3162	while (my $size_alloc = delete $self->{size_alloc}) {
3047	for (values %{delete $self->{size_alloc}}) {	3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3048	my ($widget, $w, $h) = @$_;	3164	values %$size_alloc;
		3165
		3166	while () {
		3167	my ($widget, $w, $h) = @{ pop @queue or last };
		3168
		3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3049		3171
3050	$w = 0 if $w < 0;	3172	$w = 0 if $w < 0;
3051	$h = 0 if $h < 0;	3173	$h = 0 if $h < 0;
3052		3174
		3175	$w = int $w + 0.5;
		3176	$h = int $h + 0.5;
		3177
		3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3179
3053	$widget->{w} = $w;	3180	$widget->{w} = $w;
3054	$widget->{h} = $h;	3181	$widget->{h} = $h;
3055	$widget->size_allocate ($w, $h);	3182
3056	$widget->emit (size_allocate => $w, $h);	3183	$widget->emit (size_allocate => $w, $h, $changed);
3057	}	3184	}
3058	}	3185	}
3059		3186
3060	while ($self->{post_alloc_hook}) {	3187	while ($self->{post_alloc_hook}) {
3061	$_->()	3188	$_->()

Diff Legend

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