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.216 by root, Fri May 19 16:43:57 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) = @_;
…		…
136	$rem += $_ - $i;	145	$rem += $_ - $i;
137	$_ = $i;	146	$_ = $i;
138	}	147	}
139	}	148	}
140		149
		150	sub full_refresh {
		151	# make a copy, otherwise for complains about freed values.
		152	my @widgets = values %WIDGET;
		153
		154	$_->update
		155	for @widgets;
		156	}
		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
141	# call when resolution changes etc.	166	# call when resolution changes etc.
142	sub rescale_widgets {	167	sub rescale_widgets {
143	my ($sx, $sy) = @_;	168	my ($sx, $sy) = @_;
144		169
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	170	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	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
150	$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.]+$/;
151	$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};
152	$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};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$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.]+$/;
155	$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};
156	$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};
157	$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
158	}	185	}
159
160	$widget->reconfigure;
161	}	186	}
		187
		188	reconfigure_widgets;
162	}	189	}
163		190
164	#############################################################################	191	#############################################################################
165		192
166	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
171		198
172	sub new {	199	sub new {
173	my $class = shift;	200	my $class = shift;
174		201
175	my $self = bless {	202	my $self = bless {
176	x => 0,	203	x => "center",
177	y => 0,	204	y => "center",
178	z => 0,	205	z => 0,
		206	w => undef,
		207	h => undef,
179	can_events => 1,	208	can_events => 1,
180	@_	209	@_
181	}, $class;	210	}, $class;
182		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
183	for (keys %$self) {	224	for (keys %$self) {
184	if (/^connect_(.*)$/) {	225	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	226	$self->connect ($1 => delete $self->{$_});
186	}	227	}
187	}	228	}
188		229
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
191	$self	230	$self
192	}	231	}
193		232
194	sub destroy {	233	sub destroy {
195	my ($self) = @_;	234	my ($self) = @_;
…		…
204	return if $self->{parent};	243	return if $self->{parent};
205		244
206	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
207	}	246	}
208		247
209	sub hide {	248	sub set_visible {
210	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};
211		272
212	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
214		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
215	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
216	if $self->{parent};	307	if $self->{parent};
217	}	308	}
218		309
219	sub move {	310	sub move_abs {
220	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
221		312
222	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
223	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
224	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
225		316
226	$self->update;	317	$self->update;
227	}	318	}
228		319
229	sub set_size {	320	sub set_size {
230	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
231		322
232	$self->{user_w} = $w;	323	$self->{force_w} = $w;
233	$self->{user_h} = $h;	324	$self->{force_h} = $h;
234		325
235	$self->check_size;	326	$self->realloc;
236	}	327	}
237		328
238	sub size_request {	329	sub size_request {
239	require Carp;	330	require Carp;
240	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
242		333
243	sub configure {	334	sub configure {
244	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
245		336
246	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
247	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
248	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
249		342
250	# use alignment to adjust x, y	343	# use alignment to adjust x, y
251		344
252	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
253	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
254
255	($w, $h) = ($w2, $h2);
256	}	347	}
257		348
258	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
259	$self->{x} = $x;	350	$self->{x} = $x;
260	$self->{y} = $y;	351	$self->{y} = $y;
261	$self->update;	352	$self->update;
262	}	353	}
263		354
264	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
		356	return unless $self->{visible};
		357
265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
266	}	359	}
267	}	360	}
268		361
269	sub size_allocate {	362	sub size_allocate {
270	# nothing to be done	363	# nothing to be done
271	}	364	}
272		365
273	sub reconfigure {
274	my ($self) = @_;
275
276	$self->check_size (1);
277	$self->update;
278	}
279
280	sub children {	366	sub children {
281	}	367	}
282		368
283	sub set_max_size {	369	sub set_max_size {
284	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
…		…
287	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
288	}	374	}
289		375
290	sub set_tooltip {	376	sub set_tooltip {
291	my ($self, $tooltip) = @_;	377	my ($self, $tooltip) = @_;
		378
		379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
292		383
293	$self->{tooltip} = $tooltip;	384	$self->{tooltip} = $tooltip;
294		385
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	387	delete $CFClient::UI::TOOLTIP->{owner};
…		…
318	return if $FOCUS == $self;	409	return if $FOCUS == $self;
319	return unless $self->{can_focus};	410	return unless $self->{can_focus};
320		411
321	my $focus = $FOCUS; $FOCUS = $self;	412	my $focus = $FOCUS; $FOCUS = $self;
322		413
323	$self->emit (focus_in => $focus);	414	$self->_emit (focus_in => $focus);
324		415
325	$focus->update if $focus;	416	$focus->update if $focus;
326	$FOCUS->update;	417	$FOCUS->update;
327	}	418	}
328		419
…		…
331		422
332	return unless $FOCUS == $self;	423	return unless $FOCUS == $self;
333		424
334	my $focus = $FOCUS; undef $FOCUS;	425	my $focus = $FOCUS; undef $FOCUS;
335		426
336	$self->emit (focus_out => $focus);	427	$self->_emit (focus_out => $focus);
337		428
338	$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;
339	}	433	}
340		434
341	sub mouse_motion { }	435	sub mouse_motion { }
342	sub button_up { }	436	sub button_up { }
343	sub key_down { }	437	sub key_down { }
344	sub key_up { }	438	sub key_up { }
345		439
346	sub button_down {	440	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	441	my ($self, $ev, $x, $y) = @_;
348		442
349	$self->focus_in;	443	$self->focus_in;
…		…
352	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356	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	}
357		521
358	sub draw {	522	sub draw {
359	my ($self) = @_;	523	my ($self) = @_;
360		524
361	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
378	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
379	glEnd;	543	glEnd;
380	glDisable GL_BLEND;	544	glDisable GL_BLEND;
381	}	545	}
382		546
383	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
384	glPushMatrix;	548	glPushMatrix;
385	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	552	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
392	glEnd;	556	glEnd;
393	glPopMatrix;	557	glPopMatrix;
394	#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;
395	}	559	}
396	}	560	}
397		561
398	sub _draw {	562	sub _draw {
399	my ($self) = @_;	563	my ($self) = @_;
400		564
401	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
402	}
403
404	sub find_widget {
405	my ($self, $x, $y) = @_;
406
407	return () unless $self->{can_events};
408
409	return $self
410	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413	()
414	}
415
416	sub set_parent {
417	my ($self, $parent) = @_;
418
419	Scalar::Util::weaken ($self->{parent} = $parent);
420
421	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size
423	unless exists $self->{req_w};
424	}
425
426	sub check_size {
427	my ($self, $forced) = @_;
428
429	$self->{force_alloc} = 1 if $forced;
430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
431	}
432
433	sub update {
434	my ($self) = @_;
435
436	$self->{parent}->update
437	if $self->{parent};
438	}
439
440	sub connect {
441	my ($self, $signal, $cb) = @_;
442
443	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}
445
446	sub emit {
447	my ($self, $signal, @args) = @_;
448
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450	}	566	}
451		567
452	sub DESTROY {	568	sub DESTROY {
453	my ($self) = @_;	569	my ($self) = @_;
454		570
…		…
512	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
513	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
514	}	630	}
515		631
516	sub size_request {	632	sub size_request {
517	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
518	}	636	}
519		637
520	sub draw { }	638	sub draw { }
521		639
522	#############################################################################	640	#############################################################################
…		…
551	$self->{children} = [	669	$self->{children} = [
552	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
553	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
554	];	672	];
555		673
556	$self->check_size (1);	674	$self->realloc;
557	$self->update;
558	}	675	}
559		676
560	sub children {	677	sub children {
561	@{ $_[0]{children} }	678	@{ $_[0]{children} }
562	}	679	}
…		…
567	delete $child->{parent};	684	delete $child->{parent};
568	$child->hide;	685	$child->hide;
569		686
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		688
572	$self->check_size;	689	$self->realloc;
573	$self->update;
574	}	690	}
575		691
576	sub clear {	692	sub clear {
577	my ($self) = @_;	693	my ($self) = @_;
578		694
…		…
582	for (@$children) {	698	for (@$children) {
583	delete $_->{parent};	699	delete $_->{parent};
584	$_->hide;	700	$_->hide;
585	}	701	}
586		702
587	$self->check_size;	703	$self->realloc;
588	$self->update;
589	}	704	}
590		705
591	sub find_widget {	706	sub find_widget {
592	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
593		708
…		…
646	sub size_request {	761	sub size_request {
647	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
648	}	763	}
649		764
650	sub size_allocate {	765	sub size_allocate {
651	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
652		767
653	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
654	}	769	}
655		770
656	#############################################################################	771	#############################################################################
…		…
673	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
674	$self->SUPER::update;	789	$self->SUPER::update;
675	}	790	}
676		791
677	sub size_allocate {	792	sub size_allocate {
678	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
679		794
680	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
681	$self->update;	796	$self->update
		797	if $changed;
682	}	798	}
683		799
684	sub _render {	800	sub _render {
685	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
686	}	802	}
…		…
717		833
718	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
719		835
720	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
721		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
722	sub size_request {	848	sub size_request {
723	my ($self) = @_;	849	my ($self) = @_;
724		850
725	@$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)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		852
728	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
729	}	857	}
730		858
731	sub size_allocate {	859	sub size_allocate {
732	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
733		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);
734	$self->update;	866	$self->update;
735	}	867	}
736		868
737	sub set_offset {	869	sub set_offset {
738	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
789	my $class = shift;	921	my $class = shift;
790		922
791	my $self;	923	my $self;
792		924
793	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
794	vertical => 1,	926	vertical => 1,
795	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
796	connect_changed => sub {	928	on_changed => sub {
797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	929	$self->{vp}->set_offset (0, $_[1]);
798	},	930	},
799	;	931	;
800		932
801	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
802	vp => (new CFClient::UI::ViewPort),	934	vp => (new CFClient::UI::ViewPort expand => 1),
803	slider => $slider,	935	slider => $slider,
804	@_,	936	@_,
805	);	937	);
806		938
807	$self->{vp}->add ($self->{scrolled});	939	$self->{vp}->add ($self->{scrolled});
808	$self->add ($self->{vp});	940	$self->add ($self->{vp});
809	$self->add ($self->{slider});	941	$self->add ($self->{slider});
810		942
811	$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]);
812	}	963	}
813		964
814	#TODO# update range on size_allocate depending on child	965	#TODO# update range on size_allocate depending on child
815	# update viewport offset on scroll	966	# update viewport offset on scroll
816		967
…		…
860		1011
861	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
862		1013
863	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
864		1015
865	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 =
866	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867	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);
868		1023
869	sub new {	1024	sub new {
870	my $class = shift;	1025	my $class = shift;
871		1026
872	# TODO: user_x, user_y, overwrite moveto?
873
874	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
875	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
876	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
877	border => 0.6,	1030	border => 0.6,
878	toplevel => 1,
879	can_events => 1,	1031	can_events => 1,
880	@_	1032	@_
881	);	1033	);
882		1034
883	$self->{title} &&= new CFClient::UI::Label	1035	$self->{title} &&= new CFClient::UI::Label
884	align => 0,	1036	align => 0,
…		…
903	$h + $self->border * 2,	1055	$h + $self->border * 2,
904	)	1056	)
905	}	1057	}
906		1058
907	sub size_allocate {	1059	sub size_allocate {
908	my ($self, $w, $h) = @_;	1060	my ($self, $w, $h, $changed) = @_;
		1061
		1062	return unless $changed;
909		1063
910	$h -= List::Util::max 0, $self->border * 2;	1064	$h -= List::Util::max 0, $self->border * 2;
911	$w -= List::Util::max 0, $self->border * 2;	1065	$w -= List::Util::max 0, $self->border * 2;
912		1066
913	$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)
…		…
937	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
938		1092
939	my $dx = $ev->{x} - $ox;	1093	my $dx = $ev->{x} - $ox;
940	my $dy = $ev->{y} - $oy;	1094	my $dy = $ev->{y} - $oy;
941		1095
942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1098
		1099	$self->realloc;
944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945	$self->check_size;
946	};	1101	};
947		1102
948	} elsif ($lr ^ $td) {	1103	} elsif ($lr ^ $td) {
949	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});
950	my ($bx, $by) = ($self->{x}, $self->{y});	1105	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
952	$self->{motion} = sub {	1107	$self->{motion} = sub {
953	my ($ev, $x, $y) = @_;	1108	my ($ev, $x, $y) = @_;
954		1109
955	($x, $y) = ($ev->{x}, $ev->{y});	1110	($x, $y) = ($ev->{x}, $ev->{y});
956		1111
957	$self->move ($bx + $x - $ox, $by + $y - $oy);	1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958	$self->update;
959	};	1113	};
960	}	1114	}
961	}	1115	}
962		1116
963	sub button_up {	1117	sub button_up {
…		…
982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983		1137
984	my $border = $self->border;	1138	my $border = $self->border;
985		1139
986	glColor @{ $self->{border_bg} };	1140	glColor @{ $self->{border_bg} };
987	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1141	$border[0]->draw_quad_alpha (0, 0, $w, $border);
988	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1142	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
989	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1143	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1144	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991		1145
992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1146	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993	my $bg = $tex[0];	1147	glColor @{ $self->{bg} };
994		1148
995	# TODO: repeat texture not scale	1149	# TODO: repeat texture not scale
		1150	# solve this better(?)
996	my $rep_x = $cw / $bg->{w};	1151	$bg->{s} = $cw / $bg->{w};
997	my $rep_y = $ch / $bg->{h};	1152	$bg->{t} = $ch / $bg->{h};
998
999	glColor @{ $self->{bg} };
1000
1001	$bg->{s} = $rep_x;
1002	$bg->{t} = $rep_y;
1003	$bg->{wrap_mode} = 1;
1004	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005	}	1154	}
1006		1155
1007	glDisable GL_TEXTURE_2D;	1156	glDisable GL_TEXTURE_2D;
1008		1157
…		…
1024	sub new {	1173	sub new {
1025	my $class = shift;	1174	my $class = shift;
1026		1175
1027	$class->SUPER::new (	1176	$class->SUPER::new (
1028	col_expand => [],	1177	col_expand => [],
1029	@_	1178	@_,
1030	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}	1184	}
1032		1185
1033	sub add {	1186	sub add {
1034	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1035		1188
1036	$child->set_parent ($self);	1189	$child->set_parent ($self);
1037	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1038		1191
1039	$child->check_size;	1192	$self->realloc;
1040	}	1193	}
1041		1194
1042	sub children {
1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044	}
1045
1046	# 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?
1047	sub clear {	1196	sub clear {
1048	my ($self) = @_;	1197	my ($self) = @_;
1049		1198
1050	my @children = $self->children;	1199	my @children = $self->children;
1051	delete $self->{children};	1200	delete $self->{children};
…		…
1053	for (@children) {	1202	for (@children) {
1054	delete $_->{parent};	1203	delete $_->{parent};
1055	$_->hide;	1204	$_->hide;
1056	}	1205	}
1057		1206
1058	$self->update;	1207	$self->realloc;
1059	}	1208	}
1060		1209
1061	sub get_wh {	1210	sub get_wh {
1062	my ($self) = @_;	1211	my ($self) = @_;
1063		1212
…		…
1090	(sum @$hs),	1239	(sum @$hs),
1091	)	1240	)
1092	}	1241	}
1093		1242
1094	sub size_allocate {	1243	sub size_allocate {
1095	my ($self, $w, $h) = @_;	1244	my ($self, $w, $h, $changed) = @_;
1096		1245
1097	my ($ws, $hs) = $self->get_wh;	1246	my ($ws, $hs) = $self->get_wh;
1098		1247
1099	my $req_w = sum @$ws;	1248	my $req_w = (sum @$ws) || 1;
1100	my $req_h = sum @$hs;	1249	my $req_h = (sum @$hs) || 1;
1101		1250
1102	# TODO: nicer code && do row_expand	1251	# TODO: nicer code && do row_expand
1103	my @col_expand = @{$self->{col_expand}};	1252	my @col_expand = @{$self->{col_expand}};
1104	@col_expand = (1) x @$ws unless @col_expand;	1253	@col_expand = (1) x @$ws unless @col_expand;
1105	my $col_expand = (sum @col_expand) || 1;	1254	my $col_expand = (sum @col_expand) || 1;
…		…
1159	}	1308	}
1160	}	1309	}
1161		1310
1162	#############################################################################	1311	#############################################################################
1163		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
1164	package CFClient::UI::HBox;	1373	package CFClient::UI::HBox;
1165		1374
1166	# TODO: wrap into common Box base class
1167
1168	our @ISA = CFClient::UI::Container::;	1375	our @ISA = CFClient::UI::Box::;
1169		1376
1170	sub size_request {	1377	sub new {
1171	my ($self) = @_;	1378	my $class = shift;
1172		1379
1173	my @alloc = map [$_->size_request], @{$self->{children}};	1380	$class->SUPER::new (
1174		1381	vertical => 0,
1175	(	1382	@_,
1176	(List::Util::sum map $_->[0], @alloc),
1177	(List::Util::max map $_->[1], @alloc),
1178	)	1383	)
1179	}	1384	}
1180		1385
1181	sub size_allocate {
1182	my ($self, $w, $h) = @_;
1183
1184	($h, $w) = ($w, $h);
1185
1186	my $children = $self->{children};
1187
1188	my @h = map $_->{req_w}, @$children;
1189
1190	my $req_h = List::Util::sum @h;
1191
1192	if ($req_h > $h) {
1193	# ah well, not enough space
1194	$_ *= $h / $req_h for @h;
1195	} else {
1196	my $exp = List::Util::sum map $_->{expand}, @$children;
1197	$exp ||= 1;
1198
1199	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201
1202	my $alloc_h = $h[$_];
1203	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204	$h[$_] = $alloc_h;
1205	}
1206	}
1207
1208	CFClient::UI::harmonize \@h;
1209
1210	my $y = 0;
1211	for (0 .. $#$children) {
1212	my $child = $children->[$_];
1213	my $h = $h[$_];
1214	$child->configure ($y, 0, $h, $w);
1215
1216	$y += $h;
1217	}
1218
1219	1
1220	}
1221
1222	#############################################################################	1386	#############################################################################
1223		1387
1224	package CFClient::UI::VBox;	1388	package CFClient::UI::VBox;
1225		1389
1226	# TODO: wrap into common Box base class
1227
1228	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Box::;
1229		1391
1230	sub size_request {	1392	sub new {
1231	my ($self) = @_;	1393	my $class = shift;
1232		1394
1233	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$class->SUPER::new (
1234		1396	vertical => 1,
1235	(	1397	@_,
1236	(List::Util::max map $_->[0], @alloc),
1237	(List::Util::sum map $_->[1], @alloc),
1238	)	1398	)
1239	}
1240
1241	sub size_allocate {
1242	my ($self, $w, $h) = @_;
1243
1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246	my $children = $self->{children};
1247
1248	my @h = map $_->{req_h}, @$children;
1249
1250	my $req_h = List::Util::sum @h;
1251
1252	if ($req_h > $h) {
1253	# ah well, not enough space
1254	$_ *= $h / $req_h for @h;
1255	} else {
1256	my $exp = List::Util::sum map $_->{expand}, @$children;
1257	$exp ||= 1;
1258
1259	for (0 .. $#$children) {
1260	my $child = $children->[$_];
1261
1262	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263	}
1264	}
1265
1266	CFClient::UI::harmonize \@h;
1267
1268	my $y = 0;
1269	for (0 .. $#$children) {
1270	my $child = $children->[$_];
1271	my $h = $h[$_];
1272	$child->configure (0, $y, $w, $h);
1273
1274	$y += $h;
1275	}
1276
1277	1
1278	}	1399	}
1279		1400
1280	#############################################################################	1401	#############################################################################
1281		1402
1282	package CFClient::UI::Label;	1403	package CFClient::UI::Label;
…		…
1345	$self->{text} = "T$text";	1466	$self->{text} = "T$text";
1346		1467
1347	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348	$self->{layout}->set_text ($text);	1469	$self->{layout}->set_text ($text);
1349		1470
		1471	$self->realloc;
1350	$self->update;	1472	$self->update;
1351	$self->check_size;
1352	}	1473	}
1353		1474
1354	sub set_markup {	1475	sub set_markup {
1355	my ($self, $markup) = @_;	1476	my ($self, $markup) = @_;
1356		1477
…		…
1360	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361		1482
1362	$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;
1363	$self->{layout}->set_markup ($markup);	1484	$self->{layout}->set_markup ($markup);
1364		1485
		1486	$self->realloc;
1365	$self->update;	1487	$self->update;
1366	$self->check_size;
1367	}	1488	}
1368		1489
1369	sub size_request {	1490	sub size_request {
1370	my ($self) = @_;	1491	my ($self) = @_;
1371		1492
…		…
1392	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1393	)	1514	)
1394	}	1515	}
1395		1516
1396	sub size_allocate {	1517	sub size_allocate {
1397	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1398		1519
1399	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1400	}	1522	}
1401		1523
1402	sub set_fontsize {	1524	sub set_fontsize {
1403	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1404		1526
1405	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1406	delete $self->{texture};	1528	delete $self->{texture};
1407		1529
1408	$self->update;	1530	$self->realloc;
1409	$self->check_size;
1410	}	1531	}
1411		1532
1412	sub _draw {	1533	sub _draw {
1413	my ($self) = @_;	1534	my ($self) = @_;
1414		1535
…		…
1466	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1467	can_hover => 1,	1588	can_hover => 1,
1468	can_focus => 1,	1589	can_focus => 1,
1469	valign => 0,	1590	valign => 0,
1470	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1471	@_	1593	@_
1472	)	1594	)
1473	}	1595	}
1474		1596
1475	sub _set_text {	1597	sub _set_text {
…		…
1485	$self->{text} = $text;	1607	$self->{text} = $text;
1486		1608
1487	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1488	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1489		1611
1490	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1491	}	1613	}
1492		1614
1493	sub set_text {	1615	sub set_text {
1494	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1495		1617
1496	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1497	$self->_set_text ($text);	1619	$self->_set_text ($text);
1498	$self->update;	1620
1499	$self->check_size;	1621	$self->realloc;
1500	}	1622	}
1501		1623
1502	sub get_text {	1624	sub get_text {
1503	$_[0]{text}	1625	$_[0]{text}
1504	}	1626	}
…		…
1507	my ($self) = @_;	1629	my ($self) = @_;
1508		1630
1509	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1510		1632
1511	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1512	}
1513
1514	sub size_allocate {
1515	my ($self, $w, $h) = @_;
1516
1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518	}	1634	}
1519		1635
1520	sub key_down {	1636	sub key_down {
1521	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1522		1638
…		…
1537	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1538	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1539	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1540	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1541	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1542	$self->emit ('escape');	1658	$self->_emit ('escape');
1543	} elsif ($uni) {	1659	} elsif ($uni) {
1544	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1545	}	1661	}
1546		1662
1547	$self->_set_text ($text);	1663	$self->_set_text ($text);
1548	$self->update;	1664
1549	$self->check_size;	1665	$self->realloc;
1550	}	1666	}
1551		1667
1552	sub focus_in {	1668	sub focus_in {
1553	my ($self) = @_;	1669	my ($self) = @_;
1554		1670
…		…
1634	if ($sym == 13) {	1750	if ($sym == 13) {
1635	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1636	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1637	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1638	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1639	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1640	$self->update;	1756	$self->update;
1641		1757
1642	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1643	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1644	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1692	can_events => 1,	1808	can_events => 1,
1693	@_	1809	@_
1694	)	1810	)
1695	}	1811	}
1696		1812
		1813	sub activate { }
		1814
1697	sub button_up {	1815	sub button_up {
1698	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1699		1817
		1818	$self->emit ("activate")
1700	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1701	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1702	$self->emit ("activate");
1703	}
1704	}	1821	}
1705		1822
1706	sub _draw {	1823	sub _draw {
1707	my ($self) = @_;	1824	my ($self) = @_;
1708		1825
…		…
1760	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1761		1878
1762	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1765	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1766	}	1883	}
1767	}	1884	}
1768		1885
1769	sub _draw {	1886	sub _draw {
1770	my ($self) = @_;	1887	my ($self) = @_;
…		…
2045	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
2046	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2047	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
2048	bg => [0, 0, 0, 0.2],	2165	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],	2166	active_bg => [1, 1, 1, 0.5],
2050	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
2051	req_w => $::WIDTH / 80,	2168	min_w => $::WIDTH / 80,
2052	req_h => $::WIDTH / 80,	2169	min_h => $::WIDTH / 80,
2053	vertical => 0,	2170	vertical => 0,
2054	can_hover => 1,	2171	can_hover => 1,
2055	inner_pad => .05,	2172	inner_pad => 0.02,
2056	@_	2173	@_
2057	);	2174	);
2058		2175
2059	$self->set_value ($self->{range}[0]);	2176	$self->set_value ($self->{range}[0]);
2060	$self->update;	2177	$self->update;
2061		2178
2062	$self	2179	$self
2063	}	2180	}
2064		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
2065	sub set_value {	2193	sub set_value {
2066	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2067		2195
2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069		2197
2070	$hi = $lo + 1 if $hi <= $lo;	2198	$hi = $lo + 1 if $hi <= $lo;
2071		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
2072	$value = $lo if $value < $lo;	2202	$value = $lo if $value < $lo;
2073	$value = $hi if $value > $hi;	2203	$value = $hi - $page if $value > $hi - $page;
2074		2204
2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076	if $unit;	2206	if $unit;
2077		2207
2078	$page = $hi - $lo if $page > $hi - $lo;
2079
2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081		2209
2082	if ($value != $old_value) {	2210	if ($value != $old_value) {
2083	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2084	$self->update;	2212	$self->update;
2085	}	2213	}
2086	}	2214	}
2087		2215
2088	sub size_request {	2216	sub size_request {
2089	my ($self) = @_;	2217	my ($self) = @_;
2090		2218
2091	my $w = $self->{req_w};	2219	($self->{req_w}, $self->{req_h})
2092	my $h = $self->{req_h};
2093
2094	$self->{vertical} ? ($h, $w) : ($w, $h)
2095	}	2220	}
2096		2221
2097	sub button_down {	2222	sub button_down {
2098	my ($self, $ev, $x, $y) = @_;	2223	my ($self, $ev, $x, $y) = @_;
2099		2224
2100	$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
2101	$self->mouse_motion ($ev, $x, $y);	2229	$self->mouse_motion ($ev, $x, $y);
2102	}	2230	}
2103		2231
2104	sub mouse_motion {	2232	sub mouse_motion {
2105	my ($self, $ev, $x, $y) = @_;	2233	my ($self, $ev, $x, $y) = @_;
…		…
2107	if ($GRAB == $self) {	2235	if ($GRAB == $self) {
2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2236	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109		2237
2110	my (undef, $lo, $hi, $page) = @{$self->{range}};	2238	my (undef, $lo, $hi, $page) = @{$self->{range}};
2111		2239
2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113		2241
2114	$self->set_value ($x * ($hi - $lo) + $lo);	2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115	}	2243	}
2116	}	2244	}
2117		2245
2118	sub update {	2246	sub update {
2119	my ($self) = @_;	2247	my ($self) = @_;
2120		2248
2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122	$self->set_value ($self->{range}[0]);	2250	$self->set_value ($self->{range}[0]);
2123		2251
2124	my ($value, $lo, $hi, $page) = @{$self->{range}};	2252	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2253	my $range = ($hi - $page - $lo) || 1e-100;
2125		2254
2126	my $inner_w = 1 - 2 * $self->{inner_pad};	2255	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127		2256
2128	$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;
2129		2259
2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2260	$value = ($value - $lo) / $range;
2131	$value = $self->{scale} * ($value - $lo);	2261	$value = $value * $self->{scale} + $self->{offset};
2132		2262
2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135	$value = 0 if $value < 0;
2136	$page = 1 - $value if $value + $page > 1;
2137
2138	$self->{knob_x} = $value;	2263	$self->{knob_x} = $value - $knob_w * 0.5;
2139	$self->{knob_w} = $page;	2264	$self->{knob_w} = $knob_w;
2140	});	2265	});
2141		2266
2142	$self->SUPER::update;	2267	$self->SUPER::update;
2143	}	2268	}
2144		2269
…		…
2168	# draw handle	2293	# draw handle
2169	$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);
2170		2295
2171	glDisable GL_TEXTURE_2D;	2296	glDisable GL_TEXTURE_2D;
2172	}	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 (@_) }
2173		2339
2174	#############################################################################	2340	#############################################################################
2175		2341
2176	package CFClient::UI::TextView;	2342	package CFClient::UI::TextView;
2177		2343
…		…
2207		2373
2208	$self->{fontsize} = $fontsize;	2374	$self->{fontsize} = $fontsize;
2209	$self->reflow;	2375	$self->reflow;
2210	}	2376	}
2211		2377
2212	sub text_height {
2213	my ($self, $text) = @_;
2214
2215	my $layout = $self->{layout};
2216
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});
2219	$layout->set_markup ($text);
2220
2221	($layout->size)[1]
2222	}
2223
2224	sub reflow {
2225	my ($self) = @_;
2226
2227	$self->{need_reflow}++;
2228	$self->update;
2229	}
2230
2231	sub size_allocate {	2378	sub size_allocate {
2232	my ($self, $w, $h) = @_;	2379	my ($self, $w, $h, $changed) = @_;
2233		2380
2234	$self->SUPER::size_allocate ($w, $h);	2381	$self->SUPER::size_allocate ($w, $h, $changed);
		2382
		2383	return unless $changed;
2235		2384
2236	$self->{layout}->set_font ($self->{font}) if $self->{font};	2385	$self->{layout}->set_font ($self->{font}) if $self->{font};
2237	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2239		2388
2240	$self->reflow;	2389	$self->reflow;
2241	}	2390	}
2242		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		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
2243	sub add_paragraph {	2426	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2245		2428
2246	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2247		2430	my ($w, $h) = $self->text_size ($line);
2248	my $height = $self->text_height ($text);
2249
2250	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2251		2434
2252	push @{$self->{par}}, [$height, $color, $text];
2253
2254	$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]);
2255	$self->{children}[1]->update;
2256	}	2436	}
2257		2437
2258	sub update {	2438	sub update {
2259	my ($self) = @_;	2439	my ($self) = @_;
2260		2440
…		…
2263	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2264		2444
2265	delete $self->{texture};	2445	delete $self->{texture};
2266		2446
2267	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2268	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2269	my $height = 0;	2451	my $height = 0;
2270		2452
2271	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2272	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	}
2273		2468
2274	$self->{height} = $height;	2469	$self->{height} = $height;
2275		2470
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277		2472
2278	delete $self->{texture};	2473	delete $self->{texture};
2279	}	2474	}
2280		2475
2281	$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 {
2282	glClearColor 0.5, 0.5, 0.5, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2284		2479
2285	glEnable GL_TEXTURE_2D;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288	my $top = int $self->{children}[1]{range}[0];	2480	my $top = int $self->{children}[1]{range}[0];
2289		2481
2290	my $y0 = $top;	2482	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2292		2484
2293	my $y = 0;	2485	my $y = 0;
2294		2486
2295	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2296		2488
2297	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2298		2490
		2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
		2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2494
2299	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2300	my $h = $par->[0];	2496	my $h = $par->[1];
2301		2497
2302	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2304	$layout->set_markup ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2305		2502
2306	my ($W, $H) = $layout->size;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2504
		2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308	}	2507	}
2309		2508
2310	$y += $h;	2509	$y += $h;
2311	}	2510	}
2312		2511
2313	glDisable GL_TEXTURE_2D;	2512	glDisable GL_BLEND;
2314	};	2513	};
2315	});	2514	});
2316	}	2515	}
2317		2516
2318	sub _draw {	2517	sub _draw {
…		…
2378		2577
2379	sub new {	2578	sub new {
2380	my $class = shift;	2579	my $class = shift;
2381		2580
2382	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2383	state => 0,	2582	state => 0,
2384	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2385	@_	2584	@_
2386	);	2585	);
2387		2586
2388	if ($self->{state}) {
2389	$self->{state} = 0;
2390	$self->toggle_flopper;
2391	}
2392
2393	$self	2587	$self
2394	}	2588	}
2395		2589
2396	sub toggle_flopper {	2590	sub toggle_flopper {
2397	my ($self) = @_;	2591	my ($self) = @_;
2398		2592
2399	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2400	if ($self->{state} = !$self->{state}) {
2401	$CFClient::UI::ROOT->add ($self->{other});
2402	$self->{other}->move ($self->coord2global (0, $self->{h}));
2403	$self->emit ("open");
2404	} else {
2405	$CFClient::UI::ROOT->remove ($self->{other});
2406	$self->emit ("close");
2407	}
2408
2409	$self->emit (changed => $self->{state});
2410	}	2594	}
2411		2595
2412	#############################################################################	2596	#############################################################################
2413		2597
2414	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2446		2630
2447	($w + 4, $h + 4)	2631	($w + 4, $h + 4)
2448	}	2632	}
2449		2633
2450	sub size_allocate {	2634	sub size_allocate {
2451	my ($self, $w, $h) = @_;	2635	my ($self, $w, $h, $changed) = @_;
2452		2636
		2637	return unless $changed;
		2638
2453	$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	});
2454	}	2658	}
2455		2659
2456	sub _draw {	2660	sub _draw {
2457	my ($self) = @_;	2661	my ($self) = @_;
2458		2662
…		…
2475	glVertex $w, $h;	2679	glVertex $w, $h;
2476	glVertex $w, 0;	2680	glVertex $w, 0;
2477	glEnd;	2681	glEnd;
2478		2682
2479	glTranslate 2 - 0.375, 2 - 0.375;	2683	glTranslate 2 - 0.375, 2 - 0.375;
		2684
2480	$self->SUPER::_draw;	2685	$self->SUPER::_draw;
2481	}	2686	}
2482		2687
2483	#############################################################################	2688	#############################################################################
2484		2689
…		…
2489	use CFClient::OpenGL;	2694	use CFClient::OpenGL;
2490		2695
2491	sub new {	2696	sub new {
2492	my $class = shift;	2697	my $class = shift;
2493		2698
2494	$class->SUPER::new (	2699	my $self = $class->SUPER::new (
2495	aspect => 1,	2700	aspect => 1,
		2701	can_events => 0,
2496	@_,	2702	@_,
2497	)	2703	);
		2704
		2705	if ($self->{anim} && $self->{animspeed}) {
		2706	Scalar::Util::weaken (my $widget = $self);
		2707
		2708	$self->{timer} = Event->timer (
		2709	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2710	hard => 1,
		2711	interval => $self->{animspeed},
		2712	cb => sub {
		2713	++$widget->{frame};
		2714	$widget->update;
		2715	},
		2716	);
		2717	}
		2718
		2719	$self
2498	}	2720	}
2499		2721
2500	sub size_request {	2722	sub size_request {
2501	(32, 8)	2723	(32, 8)
2502	}	2724	}
2503		2725
		2726	sub update {
		2727	my ($self) = @_;
		2728
		2729	return unless $self->{visible};
		2730
		2731	$self->SUPER::update;
		2732	}
		2733
2504	sub _draw {	2734	sub _draw {
2505	my ($self) = @_;	2735	my ($self) = @_;
2506		2736
2507	return unless $::CONN;#d# manage and cache textures differently	2737	return unless $::CONN;
		2738
		2739	my $face;
		2740
		2741	if ($self->{frame}) {
		2742	my $anim = $::CONN->{anim}[$self->{anim}];
		2743
		2744	$face = $anim->[ $self->{frame} % @$anim ]
		2745	if $anim && @$anim;
		2746	}
		2747
2508	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2748	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509		2749
2510	# TODO animation
2511	if ($tex) {	2750	if ($tex) {
2512	glEnable GL_TEXTURE_2D;	2751	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2752	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514	glColor 1, 1, 1, 1;	2753	glColor 1, 1, 1, 1;
2515	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2754	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516	glDisable GL_TEXTURE_2D;	2755	glDisable GL_TEXTURE_2D;
2517	}	2756	}
2518	}	2757	}
2519		2758
		2759	sub DESTROY {
		2760	my ($self) = @_;
		2761
		2762	$self->{timer}->cancel
		2763	if $self->{timer};
		2764
		2765	$self->SUPER::DESTROY;
		2766	}
		2767
2520	#############################################################################	2768	#############################################################################
2521		2769
2522	package CFClient::UI::InventoryItem;	2770	package CFClient::UI::Inventory;
2523		2771
2524	our @ISA = CFClient::UI::HBox::;	2772	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub _item_to_desc {
2527	my ($item) = @_;
2528
2529	my $desc =
2530	$item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	$desc
2550	}
2551		2773
2552	sub new {	2774	sub new {
2553	my $class = shift;	2775	my $class = shift;
2554		2776
2555	my %args = @_;
2556
2557	my $item = delete $args{item};
2558
2559	my $desc = _item_to_desc ($item);
2560
2561	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
2562	can_hover => 1,	2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563	can_events => 1,
2564	tooltip => ((CFClient::UI::Label::escape $desc)
2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566	connect_button_down => sub {
2567	my ($self, $ev, $x, $y) = @_;
2568
2569	# todo: maybe put examine on 1? but should just be a tooltip :(
2570	if ($ev->{button} == 1) {
2571	my $targ = $::CONN->{player}{tag};
2572
2573	if ($item->{container} == $::CONN->{player}{tag}) {
2574	$targ = $main::OPENCONT;
2575	}
2576
2577	$::CONN->send ("move $targ $item->{tag} 0");
2578	} elsif ($ev->{button} == 2) {
2579	$::CONN->send ("apply $item->{tag}");
2580	} elsif ($ev->{button} == 3) {
2581	my @menu_items = (
2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586	[
2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588	sub { $::CONN->send ("lock $item->{tag}") },
2589	],
2590	);
2591
2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593	}
2594
2595	1
2596	},
2597	%args
2598	);
2599
2600
2601	$self->add (new CFClient::UI::Face
2602	can_events => 0,
2603	face => $item->{face},
2604	anim => $item->{anim},
2605	animspeed => $item->{animspeed},
2606	);
2607
2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610	$self->{item} = $item;
2611
2612	$self->update_item;
2613
2614	$self
2615	}
2616
2617	sub update_item {
2618	my ($self) = @_;
2619
2620	my $desc = _item_to_desc ($self->{item});
2621
2622	$self->{name_lbl}->set_text ($desc);
2623	}
2624
2625	#############################################################################
2626
2627	package CFClient::UI::Inventory;
2628
2629	our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631	sub new {
2632	my $class = shift;
2633
2634	my $self = $class->SUPER::new (
2635	scrolled => (new CFClient::UI::VBox),
2636	@_,	2779	@_,
2637	);	2780	);
2638		2781
2639	$self	2782	$self
2640	}	2783	}
…		…
2650	or ($a->{name} cmp $b->{name})	2793	or ($a->{name} cmp $b->{name})
2651	} @$items;	2794	} @$items;
2652		2795
2653	$self->{real_items} = \@items;	2796	$self->{real_items} = \@items;
2654		2797
		2798	my $row = 0;
2655	for my $item (@items) {	2799	for my $item (@items) {
2656	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2800	CFClient::Item::update_widgets $item;
2657	$item->update_item ();
2658	}
2659		2801
2660	$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});
2661		2805
2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2806	$row++;
2663	}	2807	}
2664
2665	sub size_request {
2666	my ($self) = @_;
2667	($self->{req_w}, $self->{req_h});
2668	}	2808	}
2669		2809
2670	#############################################################################	2810	#############################################################################
2671		2811
2672	package CFClient::UI::Menu;	2812	package CFClient::UI::Menu;
…		…
2707		2847
2708	# 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)
2709	sub popup {	2849	sub popup {
2710	my ($self, $ev) = @_;	2850	my ($self, $ev) = @_;
2711		2851
2712	$self->emit ("popdown");	2852	$self->_emit ("popdown");
2713		2853
2714	# maybe save $GRAB? must be careful about events...	2854	# maybe save $GRAB? must be careful about events...
2715	$GRAB = $self;	2855	$GRAB = $self;
2716	$self->{button} = $ev->{button};	2856	$self->{button} = $ev->{button};
2717		2857
…		…
2732		2872
2733	if ($ev->{button} == $self->{button}) {	2873	if ($ev->{button} == $self->{button}) {
2734	undef $GRAB;	2874	undef $GRAB;
2735	$self->hide;	2875	$self->hide;
2736		2876
2737	$self->emit ("popdown");	2877	$self->_emit ("popdown");
2738	$self->{hover}[1]->() if $self->{hover};	2878	$self->{hover}[1]->() if $self->{hover};
2739	}	2879	}
2740	}	2880	}
2741		2881
2742	#############################################################################	2882	#############################################################################
…		…
2804	sub add {	2944	sub add {
2805	my ($self, $text, %arg) = @_;	2945	my ($self, $text, %arg) = @_;
2806		2946
2807	$text =~ s/^\s+//;	2947	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2948	$text =~ s/\s+$//;
		2949
		2950	return unless $text;
2809		2951
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2952	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2953
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2954	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2955
…		…
2856	use CFClient::OpenGL;	2998	use CFClient::OpenGL;
2857		2999
2858	sub new {	3000	sub new {
2859	my $class = shift;	3001	my $class = shift;
2860		3002
2861	$class->SUPER::new (	3003	my $self = $class->SUPER::new (
		3004	visible => 1,
2862	@_,	3005	@_,
2863	)	3006	);
		3007
		3008	Scalar::Util::weaken ($self->{root} = $self);
		3009
		3010	$self
2864	}	3011	}
2865		3012
2866	sub configure {	3013	sub configure {
2867	my ($self, $x, $y, $w, $h) = @_;	3014	my ($self, $x, $y, $w, $h) = @_;
2868		3015
2869	$self->{w} = $w;	3016	$self->{w} = $w;
2870	$self->{h} = $h;	3017	$self->{h} = $h;
2871	}	3018	}
2872		3019
2873	sub check_size {	3020	sub reconfigure {
2874	my ($self) = @_;	3021	my ($self) = @_;
2875		3022
		3023	$self->SUPER::reconfigure;
		3024
2876	$self->size_allocate ($self->{w}, $self->{h})	3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
2877	if $self->{w};	3026	if $self->{w};
2878	}	3027	}
2879		3028
2880	sub size_request {	3029	sub size_request {
2881	my ($self) = @_;	3030	my ($self) = @_;
2882		3031
2883	($self->{w}, $self->{h})	3032	($self->{w}, $self->{h})
2884	}	3033	}
2885		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
2886	sub size_allocate {	3049	sub size_allocate {
2887	my ($self, $w, $h) = @_;	3050	my ($self, $w, $h, $changed) = @_;
2888
2889	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894		3051
2895	for my $child ($self->children) {	3052	for my $child ($self->children) {
2896	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)};
2897		3054
2898	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3055	$X = $child->{force_x} if exists $child->{force_x};
2899	if exists $child->{req_x};	3056	$Y = $child->{force_y} if exists $child->{force_y};
2900		3057
2901	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3058	$X = _to_pixel $X, $W, $self->{w};
2902	if exists $child->{req_y};	3059	$Y = _to_pixel $Y, $H, $self->{h};
2903
2904	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906		3060
2907	$child->configure ($X, $Y, $W, $H);	3061	$child->configure ($X, $Y, $W, $H);
2908	}	3062	}
2909	}	3063	}
2910		3064
…		…
2921	}	3075	}
2922		3076
2923	sub update {	3077	sub update {
2924	my ($self) = @_;	3078	my ($self) = @_;
2925		3079
2926	$self->check_size;
2927	$::WANT_REFRESH++;	3080	$::WANT_REFRESH++;
2928	}	3081	}
2929		3082
2930	sub add {	3083	sub add {
2931	my ($self, @children) = @_;	3084	my ($self, @children) = @_;
2932		3085
2933	for my $child (@children) {
2934	$child->{toplevel} = 1;	3086	$_->{is_toplevel} = 1
2935		3087	for @children;
2936	# integerise window positions
2937	$child->{x} = int $child->{x};
2938	$child->{y} = int $child->{y};
2939	}
2940		3088
2941	$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	}
2942	}	3105	}
2943		3106
2944	sub on_refresh {	3107	sub on_refresh {
2945	my ($self, $id, $cb) = @_;	3108	my ($self, $id, $cb) = @_;
2946		3109
…		…
2959	while ($self->{refresh_hook}) {	3122	while ($self->{refresh_hook}) {
2960	$_->()	3123	$_->()
2961	for values %{delete $self->{refresh_hook}};	3124	for values %{delete $self->{refresh_hook}};
2962	}	3125	}
2963		3126
2964	if ($self->{check_size}) {	3127	if ($self->{realloc}) {
2965	my @queue = ([], []);	3128	my @queue;
2966		3129
2967	for (;;) {	3130	while () {
2968	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
2969	# heuristic: check containers last	3132	#TODO use array-of-depth approach
2970	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3133
2971	for values %{delete $self->{check_size}}	3134	@queue = sort { $a->{visible} <=> $b->{visible} }
		3135	@queue, values %{delete $self->{realloc}};
2972	}	3136	}
2973		3137
2974	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3138	my $widget = pop @queue || last;
2975		3139
2976	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3140	$widget->{visible} or last; # do not resize invisible widgets
2977	? @$widget{qw(user_w user_h)}	3141
2978	: $widget->size_request;	3142	my ($w, $h) = $widget->size_request;
2979		3143
2980	if (delete $widget->{force_alloc}	3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
2981	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3145
2982	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;
2983		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
2984	$widget->{req_w} = $w;	3152	$widget->{req_w} = $w;
2985	$widget->{req_h} = $h;	3153	$widget->{req_h} = $h;
2986		3154
2987	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];
2988		3156
2989	$widget->{parent}->check_size	3157	push @queue, $widget->{parent}
2990	if $widget->{parent};	3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2991	}
2992	}	3159	}
2993	}	3160	}
2994		3161
2995	while ($self->{size_alloc}) {	3162	while (my $size_alloc = delete $self->{size_alloc}) {
2996	for (values %{delete $self->{size_alloc}}) {	3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2997	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;
2998		3171
2999	$w = 0 if $w < 0;	3172	$w = 0 if $w < 0;
3000	$h = 0 if $h < 0;	3173	$h = 0 if $h < 0;
3001		3174
		3175	$w = int $w + 0.5;
		3176	$h = int $h + 0.5;
		3177
		3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3179
3002	$widget->{w} = $w;	3180	$widget->{w} = $w;
3003	$widget->{h} = $h;	3181	$widget->{h} = $h;
3004	$widget->size_allocate ($w, $h);	3182
3005	$widget->emit (size_allocate => $w, $h);	3183	$widget->emit (size_allocate => $w, $h, $changed);
3006	}	3184	}
3007	}	3185	}
3008		3186
3009	while ($self->{post_alloc_hook}) {	3187	while ($self->{post_alloc_hook}) {
3010	$_->()	3188	$_->()
…		…
3015	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016	glClear GL_COLOR_BUFFER_BIT;	3194	glClear GL_COLOR_BUFFER_BIT;
3017		3195
3018	glMatrixMode GL_PROJECTION;	3196	glMatrixMode GL_PROJECTION;
3019	glLoadIdentity;	3197	glLoadIdentity;
3020	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021	glMatrixMode GL_MODELVIEW;	3199	glMatrixMode GL_MODELVIEW;
3022	glLoadIdentity;	3200	glLoadIdentity;
3023		3201
3024	$self->_draw;	3202	$self->_draw;
3025	}	3203	}

Diff Legend

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