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.226 by root, Tue May 23 23:14:46 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		852
749	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
750	}	857	}
751		858
752	sub size_allocate {	859	sub size_allocate {
753	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
754		861
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756	# $w = $self->{w};	863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		864
757	$self->child->configure (0, 0, $cw, $ch);	865	$self->child->configure (0, 0, $w, $h);
758	$self->update;	866	$self->update;
759	}	867	}
760		868
761	sub set_offset {	869	sub set_offset {
762	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
813	my $class = shift;	921	my $class = shift;
814		922
815	my $self;	923	my $self;
816		924
817	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
818	vertical => 1,	926	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	928	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	929	$self->{vp}->set_offset (0, $_[1]);
822	},	930	},
823	;	931	;
824		932
825	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	934	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
831	$self->{vp}->add ($self->{scrolled});	939	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});	940	$self->add ($self->{vp});
833	$self->add ($self->{slider});	941	$self->add ($self->{slider});
834		942
835	$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]);
836	}	963	}
837		964
838	#TODO# update range on size_allocate depending on child	965	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	966	# update viewport offset on scroll
840		967
…		…
884		1011
885	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
886		1013
887	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
888		1015
889	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 =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891	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);
892		1023
893	sub new {	1024	sub new {
894	my $class = shift;	1025	my $class = shift;
895		1026
896	# TODO: user_x, user_y, overwrite moveto?
897
898	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1030	border => 0.6,
902	toplevel => 1,	1031	is_toplevel => 1,
903	can_events => 1,	1032	can_events => 1,
904	@_	1033	@_
905	);	1034	);
906		1035
907	$self->{title} &&= new CFClient::UI::Label	1036	$self->{title} &&= new CFClient::UI::Label
908	align => 0,	1037	align => 0,
…		…
927	$h + $self->border * 2,	1056	$h + $self->border * 2,
928	)	1057	)
929	}	1058	}
930		1059
931	sub size_allocate {	1060	sub size_allocate {
932	my ($self, $w, $h) = @_;	1061	my ($self, $w, $h, $changed) = @_;
		1062
		1063	return unless $changed;
933		1064
934	$h -= List::Util::max 0, $self->border * 2;	1065	$h -= List::Util::max 0, $self->border * 2;
935	$w -= List::Util::max 0, $self->border * 2;	1066	$w -= List::Util::max 0, $self->border * 2;
936		1067
937	$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)
…		…
961	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
962		1093
963	my $dx = $ev->{x} - $ox;	1094	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1095	my $dy = $ev->{y} - $oy;
965		1096
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1099
		1100	$self->realloc;
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969	$self->check_size;
970	};	1102	};
971		1103
972	} elsif ($lr ^ $td) {	1104	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1106	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1108	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1109	my ($ev, $x, $y) = @_;
978		1110
979	($x, $y) = ($ev->{x}, $ev->{y});	1111	($x, $y) = ($ev->{x}, $ev->{y});
980		1112
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1113	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982	$self->update;
983	};	1114	};
984	}	1115	}
985	}	1116	}
986		1117
987	sub button_up {	1118	sub button_up {
…		…
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1138
1008	my $border = $self->border;	1139	my $border = $self->border;
1009		1140
1010	glColor @{ $self->{border_bg} };	1141	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1142	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1143	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1144	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1145	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1146
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1147	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1148	glColor @{ $self->{bg} };
1018		1149
1019	# TODO: repeat texture not scale	1150	# TODO: repeat texture not scale
		1151	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1152	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1153	$bg->{t} = $ch / $bg->{h};
1022
1023	glColor @{ $self->{bg} };
1024
1025	$bg->{s} = $rep_x;
1026	$bg->{t} = $rep_y;
1027	$bg->{wrap_mode} = 1;
1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1155	}
1030		1156
1031	glDisable GL_TEXTURE_2D;	1157	glDisable GL_TEXTURE_2D;
1032		1158
…		…
1048	sub new {	1174	sub new {
1049	my $class = shift;	1175	my $class = shift;
1050		1176
1051	$class->SUPER::new (	1177	$class->SUPER::new (
1052	col_expand => [],	1178	col_expand => [],
1053	@_	1179	@_,
1054	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1185	}
1056		1186
1057	sub add {	1187	sub add {
1058	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1059		1189
1060	$child->set_parent ($self);	1190	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1062		1192
1063	$child->check_size;	1193	$self->realloc;
1064	}	1194	}
1065		1195
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# 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?
1071	sub clear {	1197	sub clear {
1072	my ($self) = @_;	1198	my ($self) = @_;
1073		1199
1074	my @children = $self->children;	1200	my @children = $self->children;
1075	delete $self->{children};	1201	delete $self->{children};
…		…
1077	for (@children) {	1203	for (@children) {
1078	delete $_->{parent};	1204	delete $_->{parent};
1079	$_->hide;	1205	$_->hide;
1080	}	1206	}
1081		1207
1082	$self->update;	1208	$self->realloc;
1083	}	1209	}
1084		1210
1085	sub get_wh {	1211	sub get_wh {
1086	my ($self) = @_;	1212	my ($self) = @_;
1087		1213
…		…
1114	(sum @$hs),	1240	(sum @$hs),
1115	)	1241	)
1116	}	1242	}
1117		1243
1118	sub size_allocate {	1244	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1120		1246
1121	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1122		1248
1123	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1125		1251
1126	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1309	}
1184	}	1310	}
1185		1311
1186	#############################################################################	1312	#############################################################################
1187		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
1188	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1189		1375
1190	# TODO: wrap into common Box base class
1191
1192	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1193		1377
1194	sub size_request {	1378	sub new {
1195	my ($self) = @_;	1379	my $class = shift;
1196		1380
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1198		1382	vertical => 0,
1199	(	1383	@_,
1200	(List::Util::sum map $_->[0], @alloc),
1201	(List::Util::max map $_->[1], @alloc),
1202	)	1384	)
1203	}	1385	}
1204		1386
1205	sub size_allocate {
1206	my ($self, $w, $h) = @_;
1207
1208	($h, $w) = ($w, $h);
1209
1210	my $children = $self->{children};
1211
1212	my @h = map $_->{req_w}, @$children;
1213
1214	my $req_h = List::Util::sum @h;
1215
1216	if ($req_h > $h) {
1217	# ah well, not enough space
1218	$_ *= $h / $req_h for @h;
1219	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;
1221	$exp ||= 1;
1222
1223	for (0 .. $#$children) {
1224	my $child = $children->[$_];
1225
1226	my $alloc_h = $h[$_];
1227	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228	$h[$_] = $alloc_h;
1229	}
1230	}
1231
1232	CFClient::UI::harmonize \@h;
1233
1234	my $y = 0;
1235	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];
1238	$child->configure ($y, 0, $h, $w);
1239
1240	$y += $h;
1241	}
1242
1243	1
1244	}
1245
1246	#############################################################################	1387	#############################################################################
1247		1388
1248	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1249		1390
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1253		1392
1254	sub size_request {	1393	sub new {
1255	my ($self) = @_;	1394	my $class = shift;
1256		1395
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1258		1397	vertical => 1,
1259	(	1398	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1399	)
1263	}
1264
1265	sub size_allocate {
1266	my ($self, $w, $h) = @_;
1267
1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270	my $children = $self->{children};
1271
1272	my @h = map $_->{req_h}, @$children;
1273
1274	my $req_h = List::Util::sum @h;
1275
1276	if ($req_h > $h) {
1277	# ah well, not enough space
1278	$_ *= $h / $req_h for @h;
1279	} else {
1280	my $exp = List::Util::sum map $_->{expand}, @$children;
1281	$exp ||= 1;
1282
1283	for (0 .. $#$children) {
1284	my $child = $children->[$_];
1285
1286	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287	}
1288	}
1289
1290	CFClient::UI::harmonize \@h;
1291
1292	my $y = 0;
1293	for (0 .. $#$children) {
1294	my $child = $children->[$_];
1295	my $h = $h[$_];
1296	$child->configure (0, $y, $w, $h);
1297
1298	$y += $h;
1299	}
1300
1301	1
1302	}	1400	}
1303		1401
1304	#############################################################################	1402	#############################################################################
1305		1403
1306	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1369	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1370		1468
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1373		1471
		1472	$self->realloc;
1374	$self->update;	1473	$self->update;
1375	$self->check_size;
1376	}	1474	}
1377		1475
1378	sub set_markup {	1476	sub set_markup {
1379	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1380		1478
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1483
1386	$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;
1387	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1388		1486
		1487	$self->realloc;
1389	$self->update;	1488	$self->update;
1390	$self->check_size;
1391	}	1489	}
1392		1490
1393	sub size_request {	1491	sub size_request {
1394	my ($self) = @_;	1492	my ($self) = @_;
1395		1493
…		…
1416	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1417	)	1515	)
1418	}	1516	}
1419		1517
1420	sub size_allocate {	1518	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1422		1520
1423	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1424	}	1523	}
1425		1524
1426	sub set_fontsize {	1525	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1428		1527
1429	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1529	delete $self->{texture};
1431		1530
1432	$self->update;	1531	$self->realloc;
1433	$self->check_size;
1434	}	1532	}
1435		1533
1436	sub _draw {	1534	sub _draw {
1437	my ($self) = @_;	1535	my ($self) = @_;
1438		1536
…		…
1510	$self->{text} = $text;	1608	$self->{text} = $text;
1511		1609
1512	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1514		1612
1515	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1516	}	1614	}
1517		1615
1518	sub set_text {	1616	sub set_text {
1519	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1520		1618
1521	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1620	$self->_set_text ($text);
1523	$self->update;	1621
1524	$self->check_size;	1622	$self->realloc;
1525	}	1623	}
1526		1624
1527	sub get_text {	1625	sub get_text {
1528	$_[0]{text}	1626	$_[0]{text}
1529	}	1627	}
…		…
1532	my ($self) = @_;	1630	my ($self) = @_;
1533		1631
1534	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1535		1633
1536	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1537	}
1538
1539	sub size_allocate {
1540	my ($self, $w, $h) = @_;
1541
1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543	}	1635	}
1544		1636
1545	sub key_down {	1637	sub key_down {
1546	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1547		1639
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1659	$self->_emit ('escape');
1568	} elsif ($uni) {	1660	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1570	}	1662	}
1571		1663
1572	$self->_set_text ($text);	1664	$self->_set_text ($text);
1573	$self->update;	1665
1574	$self->check_size;	1666	$self->realloc;
1575	}	1667	}
1576		1668
1577	sub focus_in {	1669	sub focus_in {
1578	my ($self) = @_;	1670	my ($self) = @_;
1579		1671
…		…
1659	if ($sym == 13) {	1751	if ($sym == 13) {
1660	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1665	$self->update;	1757	$self->update;
1666		1758
1667	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1717	can_events => 1,	1809	can_events => 1,
1718	@_	1810	@_
1719	)	1811	)
1720	}	1812	}
1721		1813
		1814	sub activate { }
		1815
1722	sub button_up {	1816	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1724		1818
		1819	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");
1728	}
1729	}	1822	}
1730		1823
1731	sub _draw {	1824	sub _draw {
1732	my ($self) = @_;	1825	my ($self) = @_;
1733		1826
…		…
1785	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1786		1879
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1791	}	1884	}
1792	}	1885	}
1793		1886
1794	sub _draw {	1887	sub _draw {
1795	my ($self) = @_;	1888	my ($self) = @_;
…		…
2070	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2071	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2072	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2073	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2074	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2075	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2076	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2077	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2078	vertical => 0,	2171	vertical => 0,
2079	can_hover => 1,	2172	can_hover => 1,
2080	inner_pad => 0.02,	2173	inner_pad => 0.02,
…		…
2085	$self->update;	2178	$self->update;
2086		2179
2087	$self	2180	$self
2088	}	2181	}
2089		2182
		2183	sub changed { }
		2184
2090	sub set_range {	2185	sub set_range {
2091	my ($self, $range) = @_;	2186	my ($self, $range) = @_;
2092		2187
2093	$self->{range} = $range;	2188	($range, $self->{range}) = ($self->{range}, $range);
2094		2189
2095	$self->update;	2190	$self->update
		2191	if "@$range" ne "@{$self->{range}}";
2096	}	2192	}
2097		2193
2098	sub set_value {	2194	sub set_value {
2099	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2100		2196
2101	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2197	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102		2198
2103	$hi = $lo + 1 if $hi <= $lo;	2199	$hi = $lo + 1 if $hi <= $lo;
2104		2200
		2201	$page = $hi - $lo if $page > $hi - $lo;
		2202
2105	$value = $lo if $value < $lo;	2203	$value = $lo if $value < $lo;
2106	$value = $hi if $value > $hi;	2204	$value = $hi - $page if $value > $hi - $page;
2107		2205
2108	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2206	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109	if $unit;	2207	if $unit;
2110		2208
2111	$page = $hi - $lo if $page > $hi - $lo;
2112
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2209	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2210
2115	if ($value != $old_value) {	2211	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2212	$self->_emit (changed => $value);
2117	$self->update;	2213	$self->update;
2118	}	2214	}
2119	}	2215	}
2120		2216
2121	sub size_request {	2217	sub size_request {
…		…
2129		2225
2130	sub button_down {	2226	sub button_down {
2131	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2132		2228
2133	$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
2134	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2135	}	2234	}
2136		2235
2137	sub mouse_motion {	2236	sub mouse_motion {
2138	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
…		…
2140	if ($GRAB == $self) {	2239	if ($GRAB == $self) {
2141	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142		2241
2143	my (undef, $lo, $hi, $page) = @{$self->{range}};	2242	my (undef, $lo, $hi, $page) = @{$self->{range}};
2144		2243
2145	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146		2245
2147	$self->set_value ($x * ($hi - $lo) + $lo);	2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148	}	2247	}
2149	}	2248	}
2150		2249
2151	sub update {	2250	sub update {
2152	my ($self) = @_;	2251	my ($self) = @_;
2153		2252
2154	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155	$self->set_value ($self->{range}[0]);	2254	$self->set_value ($self->{range}[0]);
2156		2255
2157	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2158		2258
2159	my $inner_w = 1 - 2 * $self->{inner_pad};	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160		2260
2161	$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;
2162		2263
2163	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2264	$value = ($value - $lo) / $range;
2164	$value = $self->{scale} * ($value - $lo);	2265	$value = $value * $self->{scale} + $self->{offset};
2165		2266
2166	$value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168	$value = 0 if $value < 0;
2169	$page = 1 - $value if $value + $page > 1;
2170
2171	$self->{knob_x} = $value;	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2172	$self->{knob_w} = $page;	2268	$self->{knob_w} = $knob_w;
2173	});	2269	});
2174		2270
2175	$self->SUPER::update;	2271	$self->SUPER::update;
2176	}	2272	}
2177		2273
…		…
2282	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2283	$self->reflow;	2379	$self->reflow;
2284	}	2380	}
2285		2381
2286	sub size_allocate {	2382	sub size_allocate {
2287	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2288		2384
2289	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2290		2388
2291	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2292	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2294		2392
2295	$self->reflow;	2393	$self->reflow;
2296	}	2394	}
2297		2395
2298	sub text_height {	2396	sub text_size {
2299	my ($self, $text, $indent) = @_;	2397	my ($self, $text, $indent) = @_;
2300		2398
2301	my $layout = $self->{layout};	2399	my $layout = $self->{layout};
2302		2400
2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2401	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304	$layout->set_width ($self->{children}[0]{w} - $indent);	2402	$layout->set_width ($self->{children}[0]{w} - $indent);
2305	$layout->set_markup ($text);	2403	$layout->set_markup ($text);
2306		2404
2307	($layout->size)[1]	2405	$layout->size
2308	}	2406	}
2309		2407
2310	sub reflow {	2408	sub reflow {
2311	my ($self) = @_;	2409	my ($self) = @_;
2312		2410
2313	$self->{need_reflow}++;	2411	$self->{need_reflow}++;
2314	$self->update;	2412	$self->update;
2315	}	2413	}
2316		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
2317	sub clear {	2422	sub clear {
2318	my ($self) = @_;	2423	my ($self) = @_;
2319		2424
2320	$self->{par} = [];	2425	$self->{par} = [];
2321	$self->{height} = 0;	2426	$self->{height} = 0;
2322		2427	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323	$self->reflow;
2324	}	2428	}
2325		2429
2326	sub add_paragraph {	2430	sub add_paragraph {
2327	my ($self, $color, $text, $indent) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2328		2432
2329	for my $line (split /\n/, $text) {	2433	for my $line (split /\n/, $text) {
2330	my $height = $self->text_height ($line);	2434	my ($w, $h) = $self->text_size ($line);
2331	$self->{height} += $height;	2435	$self->{height} += $h;
2332	push @{$self->{par}}, [$height, $color, $indent, $line];	2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333	}	2437	}
2334		2438
2335	$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]);
2336	$self->{children}[1]->update;
2337	}	2440	}
2338		2441
2339	sub update {	2442	sub update {
2340	my ($self) = @_;	2443	my ($self) = @_;
2341		2444
…		…
2344	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2345		2448
2346	delete $self->{texture};	2449	delete $self->{texture};
2347		2450
2348	$ROOT->on_post_alloc ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2349	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2350	my $height = 0;	2455	my $height = 0;
2351		2456
2352	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2353	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	}
2354		2472
2355	$self->{height} = $height;	2473	$self->{height} = $height;
2356		2474
2357	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358	$self->{children}[1]->update;
2359		2476
2360	delete $self->{texture};	2477	delete $self->{texture};
2361	}	2478	}
2362		2479
2363	$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 {
2364	glClearColor 0.5, 0.5, 0.5, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2365	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2366		2483
2367	my $top = int $self->{children}[1]{range}[0];	2484	my $top = int $self->{children}[1]{range}[0];
2368		2485
2369	my $y0 = $top;	2486	my $y0 = $top;
2370	my $y1 = $top + $self->{h};	2487	my $y1 = $top + $H;
2371		2488
2372	my $y = 0;	2489	my $y = 0;
2373		2490
2374	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2375		2492
2376	$layout->set_font ($self->{font}) if $self->{font};	2493	$layout->set_font ($self->{font}) if $self->{font};
2377		2494
2378	glEnable GL_BLEND;	2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
2379	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380		2498
2381	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2382	my $h = $par->[0];	2500	my $h = $par->[1];
2383		2501
2384	if ($y0 < $y + $h && $y < $y1) {	2502	if ($y0 < $y + $h && $y < $y1) {
2385	$layout->set_foreground (@{ $par->[1] });	2503	$layout->set_foreground (@{ $par->[2] });
2386	$layout->set_width ($self->{w} - $par->[2]);	2504	$layout->set_width ($W - $par->[3]);
2387	$layout->set_markup ($par->[3]);	2505	$layout->set_markup ($par->[4]);
2388		2506
2389	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390		2508
2391	glRasterPos $par->[2], $y - $y0;	2509	glRasterPos $par->[3], $y - $y0;
2392	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2510	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393	}	2511	}
2394		2512
2395	$y += $h;	2513	$y += $h;
2396	}	2514	}
…		…
2463		2581
2464	sub new {	2582	sub new {
2465	my $class = shift;	2583	my $class = shift;
2466		2584
2467	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2468	state => 0,	2586	state => 0,
2469	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2470	@_	2588	@_
2471	);	2589	);
2472		2590
2473	if ($self->{state}) {
2474	$self->{state} = 0;
2475	$self->toggle_flopper;
2476	}
2477
2478	$self	2591	$self
2479	}	2592	}
2480		2593
2481	sub toggle_flopper {	2594	sub toggle_flopper {
2482	my ($self) = @_;	2595	my ($self) = @_;
2483		2596
2484	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2485	if ($self->{state} = !$self->{state}) {
2486	$CFClient::UI::ROOT->add ($self->{other});
2487	$self->{other}->move ($self->coord2global (0, $self->{h}));
2488	$self->emit ("open");
2489	} else {
2490	$CFClient::UI::ROOT->remove ($self->{other});
2491	$self->emit ("close");
2492	}
2493
2494	$self->emit (changed => $self->{state});
2495	}	2598	}
2496		2599
2497	#############################################################################	2600	#############################################################################
2498		2601
2499	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2531		2634
2532	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2533	}	2636	}
2534		2637
2535	sub size_allocate {	2638	sub size_allocate {
2536	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2537		2640
		2641	return unless $changed;
		2642
2538	$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	});
2539	}	2662	}
2540		2663
2541	sub _draw {	2664	sub _draw {
2542	my ($self) = @_;	2665	my ($self) = @_;
2543		2666
…		…
2560	glVertex $w, $h;	2683	glVertex $w, $h;
2561	glVertex $w, 0;	2684	glVertex $w, 0;
2562	glEnd;	2685	glEnd;
2563		2686
2564	glTranslate 2 - 0.375, 2 - 0.375;	2687	glTranslate 2 - 0.375, 2 - 0.375;
		2688
2565	$self->SUPER::_draw;	2689	$self->SUPER::_draw;
2566	}	2690	}
2567		2691
2568	#############################################################################	2692	#############################################################################
2569		2693
…		…
2575		2699
2576	sub new {	2700	sub new {
2577	my $class = shift;	2701	my $class = shift;
2578		2702
2579	my $self = $class->SUPER::new (	2703	my $self = $class->SUPER::new (
2580	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2581	@_,	2706	@_,
2582	);	2707	);
2583		2708
2584	if ($self->{anim} && $self->{animspeed}) {	2709	if ($self->{anim} && $self->{animspeed}) {
2585	Scalar::Util::weaken (my $widget = $self);	2710	Scalar::Util::weaken (my $widget = $self);
…		…
2611	}	2736	}
2612		2737
2613	sub _draw {	2738	sub _draw {
2614	my ($self) = @_;	2739	my ($self) = @_;
2615		2740
2616	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
2617		2742
2618	my $face;	2743	my $face;
2619		2744
2620	if ($self->{frame}) {	2745	if ($self->{frame}) {
2621	my $anim = $::CONN->{anim}[$self->{anim}];	2746	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2644	$self->SUPER::DESTROY;	2769	$self->SUPER::DESTROY;
2645	}	2770	}
2646		2771
2647	#############################################################################	2772	#############################################################################
2648		2773
2649	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2650		2775
2651	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2652
2653	sub _item_to_desc {
2654	my ($item) = @_;
2655
2656	my $desc =
2657	$item->{nrof} < 2
2658	? $item->{name}
2659	: "$item->{nrof} × $item->{name_pl}";
2660
2661	$item->{flags} & Crossfire::Protocol::F_OPEN
2662	and $desc .= " (open)";
2663	$item->{flags} & Crossfire::Protocol::F_APPLIED
2664	and $desc .= " (applied)";
2665	$item->{flags} & Crossfire::Protocol::F_UNPAID
2666	and $desc .= " (unpaid)";
2667	$item->{flags} & Crossfire::Protocol::F_MAGIC
2668	and $desc .= " (magic)";
2669	$item->{flags} & Crossfire::Protocol::F_CURSED
2670	and $desc .= " (cursed)";
2671	$item->{flags} & Crossfire::Protocol::F_DAMNED
2672	and $desc .= " (damned)";
2673	$item->{flags} & Crossfire::Protocol::F_LOCKED
2674	and $desc .= " *";
2675
2676	$desc
2677	}
2678		2777
2679	sub new {	2778	sub new {
2680	my $class = shift;	2779	my $class = shift;
2681		2780
2682	my %args = @_;
2683
2684	my $item = delete $args{item};
2685
2686	my $desc = _item_to_desc ($item);
2687
2688	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2689	can_hover => 1,
2690	can_events => 1,
2691	tooltip => ((CFClient::UI::Label::escape $desc)
2692	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693	connect_button_down => sub {
2694	my ($self, $ev, $x, $y) = @_;
2695
2696	# todo: maybe put examine on 1? but should just be a tooltip :(
2697	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698	my $targ = $::CONN->{player}{tag};
2699
2700	if ($item->{container} == $::CONN->{player}{tag}) {
2701	$targ = $main::OPENCONT;
2702	}
2703
2704	$::CONN->send ("move $targ $item->{tag} 0");
2705	} elsif ($ev->{button} == 1) {
2706	$::CONN->send ("examine $item->{tag}");
2707	} elsif ($ev->{button} == 2) {
2708	$::CONN->send ("apply $item->{tag}");
2709	} elsif ($ev->{button} == 3) {
2710	my @menu_items = (
2711	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714	(
2715	$item->{flags} & Crossfire::Protocol::F_LOCKED
2716	? (
2717	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718	)
2719	: (
2720	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722	)
2723	),
2724	);
2725
2726	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727	}
2728
2729	1
2730	},
2731	%args
2732	);
2733
2734
2735	$self->add (new CFClient::UI::Face
2736	can_events => 0,
2737	face => $item->{face},
2738	anim => $item->{anim},
2739	animspeed => $item->{animspeed},
2740	);
2741
2742	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744	$self->{item} = $item;
2745
2746	$self->update_item;
2747
2748	$self
2749	}
2750
2751	sub update_item {
2752	my ($self) = @_;
2753
2754	my $desc = _item_to_desc ($self->{item});
2755
2756	$self->{name_lbl}->set_text ($desc);
2757	}
2758
2759	#############################################################################
2760
2761	package CFClient::UI::Inventory;
2762
2763	our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765	sub new {
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table),	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,	2783	@_,
2771	);	2784	);
2772		2785
2773	$self	2786	$self
2774	}	2787	}
…		…
2784	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2785	} @$items;	2798	} @$items;
2786		2799
2787	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2788		2801
		2802	my $row = 0;
2789	for my $item (@items) {	2803	for my $item (@items) {
2790	$item->{item} = $item;	2804	CFClient::Item::update_widgets $item;
2791	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792	$item->update_item ();
2793	}
2794		2805
2795	my $i = 0;	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2796	for (@items) {	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2797	$self->{scrolled}->add (0, $i, $_);	2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2798	my $nrof = $_->{item}->{nrof} || 1;
2799	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800	}
2801		2809
2802	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2810	$row++;
2803	}	2811	}
2804
2805	sub size_request {
2806	my ($self) = @_;
2807	($self->{req_w}, $self->{req_h});
2808	}	2812	}
2809		2813
2810	#############################################################################	2814	#############################################################################
2811		2815
2812	package CFClient::UI::Menu;	2816	package CFClient::UI::Menu;
…		…
2847		2851
2848	# 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)
2849	sub popup {	2853	sub popup {
2850	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2851		2855
2852	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2853		2857
2854	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2859	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2857		2861
…		…
2872		2876
2873	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2874	undef $GRAB;	2878	undef $GRAB;
2875	$self->hide;	2879	$self->hide;
2876		2880
2877	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2879	}	2883	}
2880	}	2884	}
2881		2885
2882	#############################################################################	2886	#############################################################################
…		…
2944	sub add {	2948	sub add {
2945	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2946		2950
2947	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2948	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2949		2955
2950	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2951		2957
2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953		2959
…		…
2996	use CFClient::OpenGL;	3002	use CFClient::OpenGL;
2997		3003
2998	sub new {	3004	sub new {
2999	my $class = shift;	3005	my $class = shift;
3000		3006
3001	$class->SUPER::new (	3007	my $self = $class->SUPER::new (
		3008	visible => 1,
3002	@_,	3009	@_,
3003	)	3010	);
		3011
		3012	Scalar::Util::weaken ($self->{root} = $self);
		3013
		3014	$self
3004	}	3015	}
3005		3016
3006	sub configure {	3017	sub configure {
3007	my ($self, $x, $y, $w, $h) = @_;	3018	my ($self, $x, $y, $w, $h) = @_;
3008		3019
3009	$self->{w} = $w;	3020	$self->{w} = $w;
3010	$self->{h} = $h;	3021	$self->{h} = $h;
3011	}	3022	}
3012		3023
3013	sub check_size {	3024	sub reconfigure {
3014	my ($self) = @_;	3025	my ($self) = @_;
3015		3026
		3027	$self->SUPER::reconfigure;
		3028
3016	$self->size_allocate ($self->{w}, $self->{h})	3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3017	if $self->{w};	3030	if $self->{w};
3018	}	3031	}
3019		3032
3020	sub size_request {	3033	sub size_request {
3021	my ($self) = @_;	3034	my ($self) = @_;
3022		3035
3023	($self->{w}, $self->{h})	3036	($self->{w}, $self->{h})
3024	}	3037	}
3025		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
3026	sub size_allocate {	3053	sub size_allocate {
3027	my ($self, $w, $h) = @_;	3054	my ($self, $w, $h, $changed) = @_;
3028
3029	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034		3055
3035	for my $child ($self->children) {	3056	for my $child ($self->children) {
3036	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)};
3037		3058
3038	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3059	$X = $child->{force_x} if exists $child->{force_x};
3039	if exists $child->{req_x};	3060	$Y = $child->{force_y} if exists $child->{force_y};
3040		3061
3041	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3062	$X = _to_pixel $X, $W, $self->{w};
3042	if exists $child->{req_y};	3063	$Y = _to_pixel $Y, $H, $self->{h};
3043
3044	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3045	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046		3064
3047	$child->configure ($X, $Y, $W, $H);	3065	$child->configure ($X, $Y, $W, $H);
3048	}	3066	}
3049	}	3067	}
3050		3068
…		…
3061	}	3079	}
3062		3080
3063	sub update {	3081	sub update {
3064	my ($self) = @_;	3082	my ($self) = @_;
3065		3083
3066	$self->check_size;
3067	$::WANT_REFRESH++;	3084	$::WANT_REFRESH++;
3068	}	3085	}
3069		3086
3070	sub add {	3087	sub add {
3071	my ($self, @children) = @_;	3088	my ($self, @children) = @_;
3072		3089
3073	for my $child (@children) {
3074	$child->{toplevel} = 1;	3090	$_->{is_toplevel} = 1
3075		3091	for @children;
3076	# integerise window positions
3077	$child->{x} = int $child->{x};
3078	$child->{y} = int $child->{y};
3079	}
3080		3092
3081	$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;
3082		3103
3083	while (@children) {	3104	while (@children) {
3084	my $w = pop @children;	3105	my $w = pop @children;
3085	push @children, $w->children;	3106	push @children, $w->children;
3086	$w->{visible} = 1;	3107	$w->set_invisible;
3087	}
3088	}
3089
3090	sub remove {
3091	my ($self, @children) = @_;
3092
3093	$self->SUPER::remove (@children);
3094
3095	while (@children) {
3096	my $w = pop @children;
3097	push @children, $w->children;
3098	delete $w->{visible};
3099	}	3108	}
3100	}	3109	}
3101		3110
3102	sub on_refresh {	3111	sub on_refresh {
3103	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
…		…
3117	while ($self->{refresh_hook}) {	3126	while ($self->{refresh_hook}) {
3118	$_->()	3127	$_->()
3119	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
3120	}	3129	}
3121		3130
3122	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
3123	my @queue = ([], []);	3132	my @queue;
3124		3133
3125	for (;;) {	3134	while () {
3126	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3127	# heuristic: check containers last	3136	#TODO use array-of-depth approach
3128	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
3129	for values %{delete $self->{check_size}}	3138	@queue = sort { $a->{visible} <=> $b->{visible} }
		3139	@queue, values %{delete $self->{realloc}};
3130	}	3140	}
3131		3141
3132	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
3133		3143
		3144	$widget->{visible} or last; # do not resize invisible widgets
		3145
3134	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3135	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(force_w force_h)}
3136	: $widget->size_request;	3148	: $widget->size_request;
3137		3149
3138	if (delete $widget->{force_alloc}	3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3139	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3151
3140	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3152	$w = $min_size if $w < $min_size;
3141		3153	$h = $min_size if $h < $min_size;
		3154
3142	$widget->{req_w} = $w;	3155	$widget->{req_w} = $w;
3143	$widget->{req_h} = $h;	3156	$widget->{req_h} = $h;
3144		3157
3145	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3146		3159
3147	$widget->{parent}->check_size	3160	push @queue, $widget->{parent}
3148	if $widget->{parent};	3161	if $widget->{parent};
3149	}
3150	}	3162	}
3151	}	3163	}
3152		3164
3153	while ($self->{size_alloc}) {	3165	while (my $size_alloc = delete $self->{size_alloc}) {
3154	for (values %{delete $self->{size_alloc}}) {	3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3155	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;
3156		3174
3157	$w = 0 if $w < 0;	3175	$w = 0 if $w < 0;
3158	$h = 0 if $h < 0;	3176	$h = 0 if $h < 0;
3159		3177
		3178	$w = int $w + 0.5;
		3179	$h = int $h + 0.5;
		3180
		3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3182
3160	$widget->{w} = $w;	3183	$widget->{w} = $w;
3161	$widget->{h} = $h;	3184	$widget->{h} = $h;
3162	$widget->size_allocate ($w, $h);	3185
3163	$widget->emit (size_allocate => $w, $h);	3186	$widget->emit (size_allocate => $w, $h, $changed);
3164	}	3187	}
3165	}	3188	}
3166		3189
3167	while ($self->{post_alloc_hook}) {	3190	while ($self->{post_alloc_hook}) {
3168	$_->()	3191	$_->()

Diff Legend

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