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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
35		55
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;	57	if $x + $TOOLTIP->{w} > $::WIDTH;
38		58
39	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;	60	$TOOLTIP->realloc;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	149	$rem += $_ - $i;
137	$_ = $i;	150	$_ = $i;
138	}	151	}
139	}	152	}
140		153
		154	sub full_refresh {
		155	# make a copy, otherwise for complains about freed values.
		156	my @widgets = values %WIDGET;
		157
		158	$_->update
		159	for @widgets;
		160	}
		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
141	# call when resolution changes etc.	170	# call when resolution changes etc.
142	sub rescale_widgets {	171	sub rescale_widgets {
143	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
144		173
145	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	176	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	177	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	178	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	179	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	180	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	181	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	182	}
156
157	$widget->reconfigure;
158	}	183	}
		184
		185	reconfigure_widgets;
159	}	186	}
160		187
161	#############################################################################	188	#############################################################################
162		189
163	package CFClient::UI::Base;	190	package CFClient::UI::Base;
…		…
176	can_events => 1,	203	can_events => 1,
177	@_	204	@_
178	}, $class;	205	}, $class;
179		206
180	for (keys %$self) {	207	for (keys %$self) {
181	if (/^connect_(.*)$/) {	208	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	209	$self->connect ($1 => delete $self->{$_});
183	}	210	}
184	}	211	}
185		212
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		214
		215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		216	$self->{req_x} = $layout->{x} * $::WIDTH;
		217	$self->{req_y} = $layout->{y} * $::HEIGHT;
		218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		220	}
		221
188	$self	222	$self
189	}	223	}
190		224
191	sub destroy {	225	sub destroy {
192	my ($self) = @_;	226	my ($self) = @_;
…		…
201	return if $self->{parent};	235	return if $self->{parent};
202		236
203	$CFClient::UI::ROOT->add ($self);	237	$CFClient::UI::ROOT->add ($self);
204	}	238	}
205		239
206	sub hide {	240	sub center {
207	my ($self) = @_;	241	my ($self) = @_;
		242
		243	$CFClient::UI::ROOT->on_post_alloc (
		244	"center_$self" => sub {
		245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		246	},
		247	);
		248
		249	$self->update;
		250	}
		251
		252	sub set_visible {
		253	my ($self) = @_;
		254
		255	return if $self->{visible};
		256
		257	$self->{root} = $self->{parent}{root};
		258	$self->{visible} = $self->{parent}{visible} + 1;
		259
		260	$self->emit (visibility_change => 1);
		261
		262	$self->realloc unless exists $self->{req_w};
		263
		264	$_->set_visible for $self->children;
		265	}
		266
		267	sub set_invisible {
		268	my ($self) = @_;
		269
		270	return unless $self->{visible};
		271
		272	$_->set_invisible for $self->children;
		273
		274	delete $self->{root};
		275	delete $self->{visible};
208		276
209	undef $GRAB if $GRAB == $self;	277	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	278	undef $HOVER if $HOVER == $self;
		279
		280	CFClient::UI::check_tooltip
		281	if $TOOLTIP->{owner} == $self;
		282
		283	$self->focus_out;
		284
		285	$self->emit (visibility_change => 0);
		286	}
		287
		288	sub set_visibility {
		289	my ($self, $visible) = @_;
		290
		291	return if $self->{visible} == $visible;
		292
		293	$visible ? $self->hide
		294	: $self->show;
		295	}
		296
		297	sub toggle_visibility {
		298	my ($self) = @_;
		299
		300	$self->{visible}
		301	? $self->hide
		302	: $self->show;
		303	}
		304
		305	sub hide {
		306	my ($self) = @_;
		307
		308	$self->set_invisible;
211		309
212	$self->{parent}->remove ($self)	310	$self->{parent}->remove ($self)
213	if $self->{parent};	311	if $self->{parent};
214	}	312	}
215		313
…		…
224	}	322	}
225		323
226	sub set_size {	324	sub set_size {
227	my ($self, $w, $h) = @_;	325	my ($self, $w, $h) = @_;
228		326
229	$self->{user_w} = $w;	327	$self->{def_w} = $w;
230	$self->{user_h} = $h;	328	$self->{def_h} = $h;
231		329
232	$self->check_size;	330	$self->realloc;
233	}	331	}
234		332
235	sub size_request {	333	sub size_request {
236	require Carp;	334	require Carp;
237	Carp::confess "size_request is abstract";	335	Carp::confess "size_request is abstract";
…		…
257	$self->{y} = $y;	355	$self->{y} = $y;
258	$self->update;	356	$self->update;
259	}	357	}
260		358
261	if ($self->{w} != $w || $self->{h} != $h) {	359	if ($self->{w} != $w || $self->{h} != $h) {
		360	return unless $self->{visible};
		361
262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
263	}	363	}
264	}	364	}
265		365
266	sub size_allocate {	366	sub size_allocate {
267	# nothing to be done	367	# nothing to be done
268	}	368	}
269		369
270	sub reconfigure {
271	my ($self) = @_;
272
273	$self->check_size (1);
274	$self->update;
275	}
276
277	sub children {	370	sub children {
278	}	371	}
279		372
280	sub set_max_size {	373	sub set_max_size {
281	my ($self, $w, $h) = @_;	374	my ($self, $w, $h) = @_;
282		375
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	376	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	377	delete $self->{max_h}; $self->{max_h} = $h if $h;
		378	}
		379
		380	sub set_tooltip {
		381	my ($self, $tooltip) = @_;
		382
		383	$tooltip =~ s/^\s+//;
		384	$tooltip =~ s/\s+$//;
		385
		386	return if $self->{tooltip} eq $tooltip;
		387
		388	$self->{tooltip} = $tooltip;
		389
		390	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		391	delete $CFClient::UI::TOOLTIP->{owner};
		392	CFClient::UI::check_tooltip;
		393	}
285	}	394	}
286		395
287	# translate global coordinates to local coordinate system	396	# translate global coordinates to local coordinate system
288	sub coord2local {	397	sub coord2local {
289	my ($self, $x, $y) = @_;	398	my ($self, $x, $y) = @_;
…		…
304	return if $FOCUS == $self;	413	return if $FOCUS == $self;
305	return unless $self->{can_focus};	414	return unless $self->{can_focus};
306		415
307	my $focus = $FOCUS; $FOCUS = $self;	416	my $focus = $FOCUS; $FOCUS = $self;
308		417
309	$self->emit (focus_in => $focus);	418	$self->_emit (focus_in => $focus);
310		419
311	$focus->update if $focus;	420	$focus->update if $focus;
312	$FOCUS->update;	421	$FOCUS->update;
313	}	422	}
314		423
…		…
317		426
318	return unless $FOCUS == $self;	427	return unless $FOCUS == $self;
319		428
320	my $focus = $FOCUS; undef $FOCUS;	429	my $focus = $FOCUS; undef $FOCUS;
321		430
322	$self->emit (focus_out => $focus);	431	$self->_emit (focus_out => $focus);
323		432
324	$focus->update if $focus; #?	433	$focus->update if $focus; #?
		434
		435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		436	unless $FOCUS;
325	}	437	}
326		438
327	sub mouse_motion { }	439	sub mouse_motion { }
328	sub button_up { }	440	sub button_up { }
329	sub key_down { }	441	sub key_down { }
330	sub key_up { }	442	sub key_up { }
331		443
332	sub button_down {	444	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	445	my ($self, $ev, $x, $y) = @_;
334		446
335	$self->focus_in;	447	$self->focus_in;
…		…
338	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
339	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
340	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
341	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
342	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		455
		456	sub find_widget {
		457	my ($self, $x, $y) = @_;
		458
		459	return () unless $self->{can_events};
		460
		461	return $self
		462	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		463	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		464
		465	()
		466	}
		467
		468	sub set_parent {
		469	my ($self, $parent) = @_;
		470
		471	Scalar::Util::weaken ($self->{parent} = $parent);
		472
		473	$self->set_visible if $parent->{visible};
		474
		475	$self->realloc;
		476	}
		477
		478	sub connect {
		479	my ($self, $signal, $cb) = @_;
		480
		481	push @{ $self->{signal_cb}{$signal} }, $cb;
		482	}
		483
		484	sub _emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		488	}
		489
		490	sub emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	$self->_emit ($signal, @args)
		494	|| $self->$signal (@args);
		495	}
		496
		497	sub visibility_change {
		498	#my ($self, $visible) = @_;
		499	}
		500
		501	sub realloc {
		502	my ($self) = @_;
		503
		504	return unless $self->{visible};
		505
		506	return if $self->{root}{realloc}{$self};
		507
		508	$self->{root}{realloc}{$self} = $self;
		509	$self->{root}->update;
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
343		518
344	sub draw {	519	sub draw {
345	my ($self) = @_;	520	my ($self) = @_;
346		521
347	return unless $self->{h} && $self->{w};	522	return unless $self->{h} && $self->{w};
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	544	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	545	glPushMatrix;
371	glColor 1, 1, 0, 1;	546	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	548	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	549	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	550	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	551	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	552	glVertex 0 , $self->{h} - 1;
378	glEnd;	553	glEnd;
379	glPopMatrix;	554	glPopMatrix;
380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	555	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	556	}
382	}	557	}
…		…
385	my ($self) = @_;	560	my ($self) = @_;
386		561
387	warn "no draw defined for $self\n";	562	warn "no draw defined for $self\n";
388	}	563	}
389		564
390	sub find_widget {
391	my ($self, $x, $y) = @_;
392
393	return () unless $self->{can_events};
394
395	return $self
396	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399	()
400	}
401
402	sub set_parent {
403	my ($self, $parent) = @_;
404
405	Scalar::Util::weaken ($self->{parent} = $parent);
406
407	# TODO: req_w _does_change after ->reconfigure
408	$self->check_size
409	unless exists $self->{req_w};
410	}
411
412	sub check_size {
413	my ($self, $forced) = @_;
414
415	$self->{force_alloc} = 1 if $forced;
416	$CFClient::UI::ROOT->{check_size}{$self} = $self;
417	}
418
419	sub update {
420	my ($self) = @_;
421
422	$self->{parent}->update
423	if $self->{parent};
424	}
425
426	sub connect {
427	my ($self, $signal, $cb) = @_;
428
429	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}
431
432	sub emit {
433	my ($self, $signal, @args) = @_;
434
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436	}
437
438	sub DESTROY {	565	sub DESTROY {
439	my ($self) = @_;	566	my ($self) = @_;
440		567
441	delete $WIDGET{$self+0};	568	delete $WIDGET{$self+0};
442	#$self->deactivate;	569	#$self->deactivate;
…		…
455	my $class = shift;	582	my $class = shift;
456		583
457	# range [value, low, high, page]	584	# range [value, low, high, page]
458		585
459	$class->SUPER::new (	586	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	587	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	588	#active_bg => [1, 1, 1, 0.5],
462	@_	589	@_
463	)	590	)
464	}	591	}
465		592
466	sub _draw {	593	sub _draw {
467	my ($self) = @_;	594	my ($self) = @_;
468		595
		596	my $color = $FOCUS == $self && $self->{active_bg}
		597	? $self->{active_bg}
		598	: $self->{bg};
		599
		600	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	601	my ($w, $h) = @$self{qw(w h)};
470		602
471	glEnable GL_BLEND;	603	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	604	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	605	glColor @$color;
474		606
475	glBegin GL_QUADS;	607	glBegin GL_QUADS;
476	glVertex 0 , 0;	608	glVertex 0 , 0;
477	glVertex 0 , $h;	609	glVertex 0 , $h;
478	glVertex $w, $h;	610	glVertex $w, $h;
479	glVertex $w, 0;	611	glVertex $w, 0;
480	glEnd;	612	glEnd;
481		613
482	glDisable GL_BLEND;	614	glDisable GL_BLEND;
		615	}
483	}	616	}
484		617
485	#############################################################################	618	#############################################################################
486		619
487	package CFClient::UI::Empty;	620	package CFClient::UI::Empty;
…		…
531	$self->{children} = [	664	$self->{children} = [
532	sort { $a->{z} <=> $b->{z} }	665	sort { $a->{z} <=> $b->{z} }
533	@{$self->{children}}, @widgets	666	@{$self->{children}}, @widgets
534	];	667	];
535		668
536	$self->check_size (1);	669	$self->realloc;
537	$self->update;
538	}	670	}
539		671
540	sub children {	672	sub children {
541	@{ $_[0]{children} }	673	@{ $_[0]{children} }
542	}	674	}
…		…
547	delete $child->{parent};	679	delete $child->{parent};
548	$child->hide;	680	$child->hide;
549		681
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	682	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		683
552	$self->check_size;	684	$self->realloc;
553	$self->update;
554	}	685	}
555		686
556	sub clear {	687	sub clear {
557	my ($self) = @_;	688	my ($self) = @_;
558		689
…		…
562	for (@$children) {	693	for (@$children) {
563	delete $_->{parent};	694	delete $_->{parent};
564	$_->hide;	695	$_->hide;
565	}	696	}
566		697
567	$self->check_size;	698	$self->realloc;
568	$self->update;
569	}	699	}
570		700
571	sub find_widget {	701	sub find_widget {
572	my ($self, $x, $y) = @_;	702	my ($self, $x, $y) = @_;
573		703
…		…
626	sub size_request {	756	sub size_request {
627	$_[0]{children}[0]->size_request	757	$_[0]{children}[0]->size_request
628	}	758	}
629		759
630	sub size_allocate {	760	sub size_allocate {
631	my ($self, $w, $h) = @_;	761	my ($self, $w, $h, $changed) = @_;
632		762
633	$self->{children}[0]->configure (0, 0, $w, $h);	763	$self->{children}[0]->configure (0, 0, $w, $h);
634	}	764	}
635		765
636	#############################################################################	766	#############################################################################
…		…
653	$ROOT->on_post_alloc ($self => sub { $self->render_child });	783	$ROOT->on_post_alloc ($self => sub { $self->render_child });
654	$self->SUPER::update;	784	$self->SUPER::update;
655	}	785	}
656		786
657	sub size_allocate {	787	sub size_allocate {
658	my ($self, $w, $h) = @_;	788	my ($self, $w, $h, $changed) = @_;
659		789
660	$self->SUPER::size_allocate ($w, $h);	790	$self->SUPER::size_allocate ($w, $h, $changed);
661	$self->update;	791	$self->update
		792	if $changed;
662	}	793	}
663		794
664	sub _render {	795	sub _render {
665	$_[0]{children}[0]->draw;	796	$_[0]{children}[0]->draw;
666	}	797	}
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	803	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	804	glClear GL_COLOR_BUFFER_BIT;
674		805
675	$self->_render;	806	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	807	};
684	}	808	}
685		809
686	sub _draw {	810	sub _draw {
687	my ($self) = @_;	811	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	815	my $tex = $self->{texture}
692	or return;	816	or return;
693		817
694	glEnable GL_TEXTURE_2D;	818	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	820	glColor 1, 1, 1, 1;
697		821
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		823
700	glDisable GL_TEXTURE_2D;	824	glDisable GL_TEXTURE_2D;
701	}	825	}
…		…
704		828
705	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
706		830
707	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
708		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
709	sub size_request {	843	sub size_request {
710	my ($self) = @_;	844	my ($self) = @_;
711		845
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		847
715	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
716	}	852	}
717		853
718	sub size_allocate {	854	sub size_allocate {
719	my ($self, $w, $h) = @_;	855	my ($self, $w, $h, $changed) = @_;
720		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
721	$self->update;	861	$self->update;
722	}	862	}
723		863
724	sub set_offset {	864	sub set_offset {
725	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	916	my $class = shift;
777		917
778	my $self;	918	my $self;
779		919
780	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
781	vertical => 1,	921	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	923	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
785	},	925	},
786	;	926	;
787		927
788	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	929	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	930	slider => $slider,
791	@_,	931	@_,
792	);	932	);
793		933
794	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	935	$self->add ($self->{vp});
796	$self->add ($self->{slider});	936	$self->add ($self->{slider});
797		937
798	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h, $changed) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h, $changed);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	958	}
800		959
801	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	961	# update viewport offset on scroll
803		962
…		…
854	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855		1014
856	sub new {	1015	sub new {
857	my $class = shift;	1016	my $class = shift;
858		1017
859	# TODO: user_x, user_y, overwrite moveto?
860
861	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1021	border => 0.6,
865	toplevel => 1,	1022	is_toplevel => 1,
866	can_events => 1,	1023	can_events => 1,
867	@_	1024	@_
868	);	1025	);
869		1026
870	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1028	align => 0,
…		…
890	$h + $self->border * 2,	1047	$h + $self->border * 2,
891	)	1048	)
892	}	1049	}
893		1050
894	sub size_allocate {	1051	sub size_allocate {
895	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h, $changed) = @_;
		1053
		1054	return unless $changed;
896		1055
897	$h -= List::Util::max 0, $self->border * 2;	1056	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1057	$w -= List::Util::max 0, $self->border * 2;
899		1058
900	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
924	my ($ev, $x, $y) = @_;	1083	my ($ev, $x, $y) = @_;
925		1084
926	my $dx = $ev->{x} - $ox;	1085	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1086	my $dy = $ev->{y} - $oy;
928		1087
		1088	$self->{user_x} = $wx + $dx * $mx;
		1089	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1092	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1093	$self->realloc;
933	};	1094	};
934		1095
935	} elsif ($lr ^ $td) {	1096	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});
937	my ($bx, $by) = ($self->{x}, $self->{y});	1098	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
939	$self->{motion} = sub {	1100	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
941		1102
942	($x, $y) = ($ev->{x}, $ev->{y});	1103	($x, $y) = ($ev->{x}, $ev->{y});
943		1104
944	$self->move ($bx + $x - $ox, $by + $y - $oy);	1105	$self->{user_x} = $bx + $x - $ox;
		1106	$self->{user_y} = $by + $y - $oy;
		1107
		1108	$self->move ($self->{user_x}, $self->{user_y});
945	$self->update;	1109	$self->realloc;
946	};	1110	};
947	}	1111	}
948	}	1112	}
949		1113
950	sub button_up {	1114	sub button_up {
…		…
1011	sub new {	1175	sub new {
1012	my $class = shift;	1176	my $class = shift;
1013		1177
1014	$class->SUPER::new (	1178	$class->SUPER::new (
1015	col_expand => [],	1179	col_expand => [],
1016	@_	1180	@_,
1017	)	1181	)
		1182	}
		1183
		1184	sub children {
		1185	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1186	}
1019		1187
1020	sub add {	1188	sub add {
1021	my ($self, $x, $y, $child) = @_;	1189	my ($self, $x, $y, $child) = @_;
1022		1190
1023	$child->set_parent ($self);	1191	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1192	$self->{children}[$y][$x] = $child;
1025		1193
1026	$child->check_size;	1194	$self->realloc;
1027	}	1195	}
1028		1196
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# TODO: move to container class maybe? send childs a signal on removal?	1197	# TODO: move to container class maybe? send children a signal on removal?
1034	sub clear {	1198	sub clear {
1035	my ($self) = @_;	1199	my ($self) = @_;
1036		1200
1037	my @children = $self->children;	1201	my @children = $self->children;
1038	delete $self->{children};	1202	delete $self->{children};
…		…
1040	for (@children) {	1204	for (@children) {
1041	delete $_->{parent};	1205	delete $_->{parent};
1042	$_->hide;	1206	$_->hide;
1043	}	1207	}
1044		1208
1045	$self->update;	1209	$self->realloc;
1046	}	1210	}
1047		1211
1048	sub get_wh {	1212	sub get_wh {
1049	my ($self) = @_;	1213	my ($self) = @_;
1050		1214
…		…
1077	(sum @$hs),	1241	(sum @$hs),
1078	)	1242	)
1079	}	1243	}
1080		1244
1081	sub size_allocate {	1245	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h, $changed) = @_;
1083		1247
1084	my ($ws, $hs) = $self->get_wh;	1248	my ($ws, $hs) = $self->get_wh;
1085		1249
1086	my $req_w = sum @$ws;	1250	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1251	my $req_h = (sum @$hs) || 1;
1088		1252
1089	# TODO: nicer code && do row_expand	1253	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1254	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1255	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1256	my $col_expand = (sum @col_expand) || 1;
…		…
1146	}	1310	}
1147	}	1311	}
1148		1312
1149	#############################################################################	1313	#############################################################################
1150		1314
		1315	package CFClient::UI::Box;
		1316
		1317	our @ISA = CFClient::UI::Container::;
		1318
		1319	sub size_request {
		1320	my ($self) = @_;
		1321
		1322	$self->{vertical}
		1323	? (
		1324	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1325	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1326	)
		1327	: (
		1328	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	}
		1332
		1333	sub size_allocate {
		1334	my ($self, $w, $h, $changed) = @_;
		1335
		1336	my $space = $self->{vertical} ? $h : $w;
		1337	my $children = $self->{children};
		1338
		1339	my @req;
		1340
		1341	if ($self->{homogeneous}) {
		1342	@req = ($space / (@$children || 1)) x @$children;
		1343	} else {
		1344	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1345	my $req = List::Util::sum @req;
		1346
		1347	if ($req > $space) {
		1348	# ah well, not enough space
		1349	$_ *= $space / $req for @req;
		1350	} else {
		1351	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1352
		1353	$space = ($space - $req) / $expand; # remaining space to give away
		1354
		1355	$req[$_] += $space * $children->[$_]{expand}
		1356	for 0 .. $#$children;
		1357	}
		1358	}
		1359
		1360	CFClient::UI::harmonize \@req;
		1361
		1362	my $pos = 0;
		1363	for (0 .. $#$children) {
		1364	my $alloc = $req[$_];
		1365	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1366
		1367	$pos += $alloc;
		1368	}
		1369
		1370	1
		1371	}
		1372
		1373	#############################################################################
		1374
1151	package CFClient::UI::HBox;	1375	package CFClient::UI::HBox;
1152		1376
1153	# TODO: wrap into common Box base class
1154
1155	our @ISA = CFClient::UI::Container::;	1377	our @ISA = CFClient::UI::Box::;
1156		1378
1157	sub size_request {	1379	sub new {
1158	my ($self) = @_;	1380	my $class = shift;
1159		1381
1160	my @alloc = map [$_->size_request], @{$self->{children}};	1382	$class->SUPER::new (
1161		1383	vertical => 0,
1162	(	1384	@_,
1163	(List::Util::sum map $_->[0], @alloc),
1164	(List::Util::max map $_->[1], @alloc),
1165	)	1385	)
1166	}	1386	}
1167		1387
1168	sub size_allocate {
1169	my ($self, $w, $h) = @_;
1170
1171	($h, $w) = ($w, $h);
1172
1173	my $children = $self->{children};
1174
1175	my @h = map $_->{req_w}, @$children;
1176
1177	my $req_h = List::Util::sum @h;
1178
1179	if ($req_h > $h) {
1180	# ah well, not enough space
1181	$_ *= $h / $req_h for @h;
1182	} else {
1183	my $exp = List::Util::sum map $_->{expand}, @$children;
1184	$exp ||= 1;
1185
1186	for (0 .. $#$children) {
1187	my $child = $children->[$_];
1188
1189	my $alloc_h = $h[$_];
1190	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191	$h[$_] = $alloc_h;
1192	}
1193	}
1194
1195	CFClient::UI::harmonize \@h;
1196
1197	my $y = 0;
1198	for (0 .. $#$children) {
1199	my $child = $children->[$_];
1200	my $h = $h[$_];
1201	$child->configure ($y, 0, $h, $w);
1202
1203	$y += $h;
1204	}
1205
1206	1
1207	}
1208
1209	#############################################################################	1388	#############################################################################
1210		1389
1211	package CFClient::UI::VBox;	1390	package CFClient::UI::VBox;
1212		1391
1213	# TODO: wrap into common Box base class
1214
1215	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Box::;
1216		1393
1217	sub size_request {	1394	sub new {
1218	my ($self) = @_;	1395	my $class = shift;
1219		1396
1220	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$class->SUPER::new (
1221		1398	vertical => 1,
1222	(	1399	@_,
1223	(List::Util::max map $_->[0], @alloc),
1224	(List::Util::sum map $_->[1], @alloc),
1225	)	1400	)
1226	}	1401	}
1227		1402
1228	sub size_allocate {
1229	my ($self, $w, $h) = @_;
1230
1231	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233	my $children = $self->{children};
1234
1235	my @h = map $_->{req_h}, @$children;
1236
1237	my $req_h = List::Util::sum @h;
1238
1239	if ($req_h > $h) {
1240	# ah well, not enough space
1241	$_ *= $h / $req_h for @h;
1242	} else {
1243	my $exp = List::Util::sum map $_->{expand}, @$children;
1244	$exp ||= 1;
1245
1246	for (0 .. $#$children) {
1247	my $child = $children->[$_];
1248
1249	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250	}
1251	}
1252
1253	CFClient::UI::harmonize \@h;
1254
1255	my $y = 0;
1256	for (0 .. $#$children) {
1257	my $child = $children->[$_];
1258	my $h = $h[$_];
1259	$child->configure (0, $y, $w, $h);
1260
1261	$y += $h;
1262	}
1263
1264	1
1265	}
1266
1267	#############################################################################	1403	#############################################################################
1268		1404
1269	package CFClient::UI::Label;	1405	package CFClient::UI::Label;
1270		1406
1271	our @ISA = CFClient::UI::Base::;	1407	our @ISA = CFClient::UI::DrawBG::;
1272		1408
1273	use CFClient::OpenGL;	1409	use CFClient::OpenGL;
1274		1410
1275	sub new {	1411	sub new {
1276	my ($class, %arg) = @_;	1412	my ($class, %arg) = @_;
1277		1413
1278	my $self = $class->SUPER::new (	1414	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1415	fg => [1, 1, 1],
		1416	#bg => none
		1417	#active_bg => none
1280	#font => default_font	1418	#font => default_font
1281	#text => initial text	1419	#text => initial text
1282	#markup => initial narkup	1420	#markup => initial narkup
		1421	#max_w => maximum pixel width
		1422	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1423	layout => (new CFClient::Layout),
1284	fontsize => 1,	1424	fontsize => 1,
1285	align => -1,	1425	align => -1,
1286	valign => -1,	1426	valign => -1,
1287	padding => 2,	1427	padding => 2,
…		…
1302	}	1442	}
1303		1443
1304	$self	1444	$self
1305	}	1445	}
1306		1446
1307	sub escape {	1447	sub escape($) {
1308	local $_ = $_[1];	1448	local $_ = $_[0];
1309		1449
1310	s/&/&amp;/g;	1450	s/&/&amp;/g;
1311	s/>/&gt;/g;	1451	s/>/&gt;/g;
1312	s/</&lt;/g;	1452	s/</&lt;/g;
1313		1453
1314	$_[1]	1454	$_
1315	}	1455	}
1316		1456
1317	sub update {	1457	sub update {
1318	my ($self) = @_;	1458	my ($self) = @_;
1319		1459
…		…
1328	$self->{text} = "T$text";	1468	$self->{text} = "T$text";
1329		1469
1330	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331	$self->{layout}->set_text ($text);	1471	$self->{layout}->set_text ($text);
1332		1472
1333	$self->update;	1473	$self->realloc;
1334	$self->check_size;
1335	}	1474	}
1336		1475
1337	sub set_markup {	1476	sub set_markup {
1338	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1339		1478
…		…
1343	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344		1483
1345	$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;
1346	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1347		1486
1348	$self->update;	1487	$self->realloc;
1349	$self->check_size;
1350	}	1488	}
1351		1489
1352	sub size_request {	1490	sub size_request {
1353	my ($self) = @_;	1491	my ($self) = @_;
1354		1492
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1493	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} || -1);	1494	$self->{layout}->set_width ($self->{max_w} || -1);
		1495	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1498
1359	my ($w, $h) = $self->{layout}->size;	1499	my ($w, $h) = $self->{layout}->size;
1360		1500
1361	if (exists $self->{template}) {	1501	if (exists $self->{template}) {
…		…
1373	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1374	)	1514	)
1375	}	1515	}
1376		1516
1377	sub size_allocate {	1517	sub size_allocate {
1378	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1379		1519
1380	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1381	}	1522	}
1382		1523
1383	sub set_fontsize {	1524	sub set_fontsize {
1384	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1385		1526
1386	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1387	delete $self->{texture};	1528	delete $self->{texture};
1388		1529
1389	$self->update;	1530	$self->realloc;
1390	$self->check_size;
1391	}	1531	}
1392		1532
1393	sub _draw {	1533	sub _draw {
1394	my ($self) = @_;	1534	my ($self) = @_;
		1535
		1536	$self->SUPER::_draw; # draw background, if applicable
1395		1537
1396	my $tex = $self->{texture} ||= do {	1538	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1539	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1540	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1541	$self->{layout}->set_width ($self->{w});
		1542	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1545
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1546	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1547
1404	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1443	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1444	can_hover => 1,	1588	can_hover => 1,
1445	can_focus => 1,	1589	can_focus => 1,
1446	valign => 0,	1590	valign => 0,
1447	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1448	@_	1593	@_
1449	)	1594	)
1450	}	1595	}
1451		1596
1452	sub _set_text {	1597	sub _set_text {
…		…
1462	$self->{text} = $text;	1607	$self->{text} = $text;
1463		1608
1464	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1466		1611
1467	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1468	}	1613	}
1469		1614
1470	sub set_text {	1615	sub set_text {
1471	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1472		1617
1473	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1619	$self->_set_text ($text);
1475	$self->update;	1620
1476	$self->check_size;	1621	$self->realloc;
1477	}	1622	}
1478		1623
1479	sub get_text {	1624	sub get_text {
1480	$_[0]{text}	1625	$_[0]{text}
1481	}	1626	}
…		…
1484	my ($self) = @_;	1629	my ($self) = @_;
1485		1630
1486	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1487		1632
1488	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1489	}
1490
1491	sub size_allocate {
1492	my ($self, $w, $h) = @_;
1493
1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495	}	1634	}
1496		1635
1497	sub key_down {	1636	sub key_down {
1498	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1499		1638
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1658	$self->_emit ('escape');
1520	} elsif ($uni) {	1659	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1661	}
1523		1662
1524	$self->_set_text ($text);	1663	$self->_set_text ($text);
1525	$self->update;	1664
1526	$self->check_size;	1665	$self->realloc;
1527	}	1666	}
1528		1667
1529	sub focus_in {	1668	sub focus_in {
1530	my ($self) = @_;	1669	my ($self) = @_;
1531		1670
…		…
1611	if ($sym == 13) {	1750	if ($sym == 13) {
1612	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1617	$self->update;	1756	$self->update;
1618		1757
1619	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1799	my $class = shift;
1661		1800
1662	$class->SUPER::new (	1801	$class->SUPER::new (
1663	padding => 4,	1802	padding => 4,
1664	fg => [1, 1, 1],	1803	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1804	active_fg => [0, 0, 1],
1667	can_hover => 1,	1805	can_hover => 1,
1668	align => 0,	1806	align => 0,
1669	valign => 0,	1807	valign => 0,
1670	can_events => 1,	1808	can_events => 1,
1671	@_	1809	@_
1672	)	1810	)
1673	}	1811	}
1674		1812
		1813	sub activate { }
		1814
1675	sub button_up {	1815	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1677		1817
		1818	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1821	}
1683		1822
1684	sub _draw {	1823	sub _draw {
1685	my ($self) = @_;	1824	my ($self) = @_;
1686		1825
…		…
1718		1857
1719	$class->SUPER::new (	1858	$class->SUPER::new (
1720	padding => 2,	1859	padding => 2,
1721	fg => [1, 1, 1],	1860	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1861	active_fg => [1, 1, 0],
		1862	bg => [0, 0, 0, 0.2],
		1863	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1864	state => 0,
1724	can_hover => 1,	1865	can_hover => 1,
1725	@_	1866	@_
1726	)	1867	)
1727	}	1868	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1737		1878
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1742	}	1883	}
1743	}	1884	}
1744		1885
1745	sub _draw {	1886	sub _draw {
1746	my ($self) = @_;	1887	my ($self) = @_;
…		…
2019	# TODO: req_w/h are wrong with vertical	2160	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2161	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
		2165	bg => [0, 0, 0, 0.2],
		2166	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2168	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2169	req_h => $::WIDTH / 80,
2027	vertical => 0,	2170	vertical => 0,
2028	can_hover => 1,	2171	can_hover => 1,
2029	inner_pad => .05,	2172	inner_pad => 0.02,
2030	@_	2173	@_
2031	);	2174	);
2032		2175
2033	$self->set_value ($self->{range}[0]);	2176	$self->set_value ($self->{range}[0]);
2034	$self->update;	2177	$self->update;
2035		2178
2036	$self	2179	$self
2037	}	2180	}
2038		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
2039	sub set_value {	2193	sub set_value {
2040	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2041		2195
2042	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043		2197
2044	$hi = $lo + 1 if $hi <= $lo;	2198	$hi = $lo + 1 if $hi <= $lo;
2045		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
2046	$value = $lo if $value < $lo;	2202	$value = $lo if $value < $lo;
2047	$value = $hi if $value > $hi;	2203	$value = $hi - $page if $value > $hi - $page;
2048		2204
2049	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050	if $unit;	2206	if $unit;
2051		2207
2052	$page = $hi - $lo if $page > $hi - $lo;
2053
2054	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055		2209
2056	if ($value != $old_value) {	2210	if ($value != $old_value) {
2057	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2058	$self->update;	2212	$self->update;
2059	}	2213	}
2060	}	2214	}
2061		2215
2062	sub size_request {	2216	sub size_request {
…		…
2070		2224
2071	sub button_down {	2225	sub button_down {
2072	my ($self, $ev, $x, $y) = @_;	2226	my ($self, $ev, $x, $y) = @_;
2073		2227
2074	$self->SUPER::button_down ($ev, $x, $y);	2228	$self->SUPER::button_down ($ev, $x, $y);
		2229
		2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2231
2075	$self->mouse_motion ($ev, $x, $y);	2232	$self->mouse_motion ($ev, $x, $y);
2076	}	2233	}
2077		2234
2078	sub mouse_motion {	2235	sub mouse_motion {
2079	my ($self, $ev, $x, $y) = @_;	2236	my ($self, $ev, $x, $y) = @_;
…		…
2081	if ($GRAB == $self) {	2238	if ($GRAB == $self) {
2082	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2239	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083		2240
2084	my (undef, $lo, $hi, $page) = @{$self->{range}};	2241	my (undef, $lo, $hi, $page) = @{$self->{range}};
2085		2242
2086	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087		2244
2088	$self->set_value ($x * ($hi - $lo) + $lo);	2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089	}	2246	}
2090	}	2247	}
2091		2248
2092	sub update {	2249	sub update {
2093	my ($self) = @_;	2250	my ($self) = @_;
2094		2251
2095	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096	$self->set_value ($self->{range}[0]);	2253	$self->set_value ($self->{range}[0]);
2097		2254
2098	my ($value, $lo, $hi, $page) = @{$self->{range}};	2255	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2256	my $range = ($hi - $page - $lo) || 1e-100;
2099		2257
2100	my $inner_w = 1 - 2 * $self->{inner_pad};	2258	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101		2259
2102	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2260	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2261	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103		2262
2104	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2263	$value = ($value - $lo) / $range;
2105	$value = $self->{scale} * ($value - $lo);	2264	$value = $value * $self->{scale} + $self->{offset};
2106		2265
2107	$value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109	$value = 0 if $value < 0;
2110	$page = 1 - $value if $value + $page > 1;
2111
2112	$self->{knob_x} = $value;	2266	$self->{knob_x} = $value - $knob_w * 0.5;
2113	$self->{knob_w} = $page;	2267	$self->{knob_w} = $knob_w;
2114	});	2268	});
2115		2269
2116	$self->SUPER::update;	2270	$self->SUPER::update;
2117	}	2271	}
2118		2272
…		…
2124	glScale $self->{w}, $self->{h};	2278	glScale $self->{w}, $self->{h};
2125		2279
2126	if ($self->{vertical}) {	2280	if ($self->{vertical}) {
2127	# draw a vertical slider like a rotated horizontal slider	2281	# draw a vertical slider like a rotated horizontal slider
2128		2282
		2283	glTranslate 1, 0, 0;
2129	glRotate 90, 0, 0, 1;	2284	glRotate 90, 0, 0, 1;
2130	glTranslate 0, 1, 0;
2131	}	2285	}
2132		2286
2133	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2287	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2288	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135		2289
…		…
2142	# draw handle	2296	# draw handle
2143	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2297	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2298
2145	glDisable GL_TEXTURE_2D;	2299	glDisable GL_TEXTURE_2D;
2146	}	2300	}
		2301
		2302	#############################################################################
		2303
		2304	package CFClient::UI::ValSlider;
		2305
		2306	our @ISA = CFClient::UI::HBox::;
		2307
		2308	sub new {
		2309	my ($class, %arg) = @_;
		2310
		2311	my $range = delete $arg{range};
		2312
		2313	my $self = $class->SUPER::new (
		2314	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2315	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2316	to_value => sub { shift },
		2317	from_value => sub { shift },
		2318	%arg,
		2319	);
		2320
		2321	$self->{slider}->connect (changed => sub {
		2322	my ($self, $value) = @_;
		2323	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2324	$self->{parent}->emit (changed => $value);
		2325	});
		2326
		2327	# $self->{entry}->connect (changed => sub {
		2328	# my ($self, $value) = @_;
		2329	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2330	# $self->{parent}->emit (changed => $value);
		2331	# });
		2332
		2333	$self->add ($self->{slider}, $self->{entry});
		2334
		2335	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2336
		2337	$self
		2338	}
		2339
		2340	sub set_range { shift->{slider}->set_range (@_) }
		2341	sub set_value { shift->{slider}->set_value (@_) }
2147		2342
2148	#############################################################################	2343	#############################################################################
2149		2344
2150	package CFClient::UI::TextView;	2345	package CFClient::UI::TextView;
2151		2346
…		…
2181		2376
2182	$self->{fontsize} = $fontsize;	2377	$self->{fontsize} = $fontsize;
2183	$self->reflow;	2378	$self->reflow;
2184	}	2379	}
2185		2380
2186	sub text_height {
2187	my ($self, $text) = @_;
2188
2189	my $layout = $self->{layout};
2190
2191	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192	$layout->set_width ($self->{children}[0]{w});
2193	$layout->set_markup ($text);
2194
2195	($layout->size)[1]
2196	}
2197
2198	sub reflow {
2199	my ($self) = @_;
2200
2201	$self->{need_reflow}++;
2202	$self->update;
2203	}
2204
2205	sub size_allocate {	2381	sub size_allocate {
2206	my ($self, $w, $h) = @_;	2382	my ($self, $w, $h, $changed) = @_;
2207		2383
2208	$self->SUPER::size_allocate ($w, $h);	2384	$self->SUPER::size_allocate ($w, $h, $changed);
		2385
		2386	return unless $changed;
2209		2387
2210	$self->{layout}->set_font ($self->{font}) if $self->{font};	2388	$self->{layout}->set_font ($self->{font}) if $self->{font};
2211	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2212	$self->{layout}->set_width ($self->{children}[0]{w});	2390	$self->{layout}->set_width ($self->{children}[0]{w});
2213		2391
2214	$self->reflow;	2392	$self->reflow;
2215	}	2393	}
2216		2394
		2395	sub text_size {
		2396	my ($self, $text, $indent) = @_;
		2397
		2398	my $layout = $self->{layout};
		2399
		2400	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2401	$layout->set_width ($self->{children}[0]{w} - $indent);
		2402	$layout->set_markup ($text);
		2403
		2404	$layout->size
		2405	}
		2406
		2407	sub reflow {
		2408	my ($self) = @_;
		2409
		2410	$self->{need_reflow}++;
		2411	$self->update;
		2412	}
		2413
		2414	sub set_offset {
		2415	my ($self, $offset) = @_;
		2416
		2417	# todo: base offset on lines or so, not on pixels
		2418	$self->{children}[1]->set_value ($offset);
		2419	}
		2420
		2421	sub clear {
		2422	my ($self) = @_;
		2423
		2424	$self->{par} = [];
		2425	$self->{height} = 0;
		2426	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2427	}
		2428
2217	sub add_paragraph {	2429	sub add_paragraph {
2218	my ($self, $color, $text) = @_;	2430	my ($self, $color, $text, $indent) = @_;
2219		2431
2220	#TODO: intelligently "reformat" paragraph	2432	for my $line (split /\n/, $text) {
2221		2433	my ($w, $h) = $self->text_size ($line);
2222	my $height = $self->text_height ($text);
2223
2224	$self->{height} += $height;	2434	$self->{height} += $h;
		2435	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2436	}
2225		2437
2226	push @{$self->{par}}, [$height, $color, $text];
2227
2228	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2438	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229	$self->{children}[1]->update;
2230	}	2439	}
2231		2440
2232	sub update {	2441	sub update {
2233	my ($self) = @_;	2442	my ($self) = @_;
2234		2443
…		…
2237	return unless $self->{h} > 0;	2446	return unless $self->{h} > 0;
2238		2447
2239	delete $self->{texture};	2448	delete $self->{texture};
2240		2449
2241	$ROOT->on_post_alloc ($self, sub {	2450	$ROOT->on_post_alloc ($self, sub {
		2451	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2452
2242	if (delete $self->{need_reflow}) {	2453	if (delete $self->{need_reflow}) {
2243	my $height = 0;	2454	my $height = 0;
2244		2455
2245	$height += $_->[0] = $self->text_height ($_->[2])	2456	my $layout = $self->{layout};
		2457
		2458	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2459
2246	for @{$self->{par}};	2460	for (@{$self->{par}}) {
		2461	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2462	$layout->set_width ($W - $_->[3]);
		2463	$layout->set_markup ($_->[4]);
		2464	my ($w, $h) = $layout->size;
		2465	$_->[0] = $w + $_->[3];
		2466	$_->[1] = $h;
		2467	}
		2468
		2469	$height += $_->[1];
		2470	}
2247		2471
2248	$self->{height} = $height;	2472	$self->{height} = $height;
2249		2473
2250	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2474	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251		2475
2252	delete $self->{texture};	2476	delete $self->{texture};
2253	}	2477	}
2254		2478
2255	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2479	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256	glClearColor 0, 0, 0, 0;	2480	glClearColor 0.5, 0.5, 0.5, 0;
2257	glClear GL_COLOR_BUFFER_BIT;	2481	glClear GL_COLOR_BUFFER_BIT;
2258		2482
2259	glEnable GL_TEXTURE_2D;
2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262	my $top = int $self->{children}[1]{range}[0];	2483	my $top = int $self->{children}[1]{range}[0];
2263		2484
2264	my $y0 = $top;	2485	my $y0 = $top;
2265	my $y1 = $top + $self->{h};	2486	my $y1 = $top + $H;
2266		2487
2267	my $y = 0;	2488	my $y = 0;
2268		2489
2269	my $layout = $self->{layout};	2490	my $layout = $self->{layout};
2270		2491
2271	$layout->set_font ($self->{font}) if $self->{font};	2492	$layout->set_font ($self->{font}) if $self->{font};
2272		2493
		2494	glEnable GL_BLEND;
		2495	#TODO# not correct in windows where rgba is forced off
		2496	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2497
2273	for my $par (@{$self->{par}}) {	2498	for my $par (@{$self->{par}}) {
2274	my $h = $par->[0];	2499	my $h = $par->[1];
2275		2500
2276	if ($y0 < $y + $h && $y < $y1) {	2501	if ($y0 < $y + $h && $y < $y1) {
2277	$layout->set_foreground (@{ $par->[1] });	2502	$layout->set_foreground (@{ $par->[2] });
		2503	$layout->set_width ($W - $par->[3]);
2278	$layout->set_markup ($par->[2]);	2504	$layout->set_markup ($par->[4]);
2279		2505
2280	my ($W, $H) = $layout->size;	2506	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2507
		2508	glRasterPos $par->[3], $y - $y0;
		2509	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282	}	2510	}
2283		2511
2284	$y += $h;	2512	$y += $h;
2285	}	2513	}
2286		2514
2287	glDisable GL_TEXTURE_2D;	2515	glDisable GL_BLEND;
2288	};	2516	};
2289	});	2517	});
2290	}	2518	}
2291		2519
2292	sub _draw {	2520	sub _draw {
2293	my ($self) = @_;	2521	my ($self) = @_;
2294		2522
2295	glEnable GL_TEXTURE_2D;	2523	glEnable GL_TEXTURE_2D;
2296	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2524	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297	glColor 1, 1, 1, 1;	2525	glColor 1, 1, 1, 1;
2298	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2526	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299	glDisable GL_TEXTURE_2D;	2527	glDisable GL_TEXTURE_2D;
2300		2528
2301	$self->{children}[1]->draw;	2529	$self->{children}[1]->draw;
2302		2530
2303	}	2531	}
…		…
2352		2580
2353	sub new {	2581	sub new {
2354	my $class = shift;	2582	my $class = shift;
2355		2583
2356	my $self = $class->SUPER::new (	2584	my $self = $class->SUPER::new (
2357	state => 0,	2585	state => 0,
2358	connect_activate => \&toggle_flopper,	2586	on_activate => \&toggle_flopper,
2359	@_	2587	@_
2360	);	2588	);
2361		2589
2362	if ($self->{state}) {
2363	$self->{state} = 0;
2364	$self->toggle_flopper;
2365	}
2366
2367	$self	2590	$self
2368	}	2591	}
2369		2592
2370	sub toggle_flopper {	2593	sub toggle_flopper {
2371	my ($self) = @_;	2594	my ($self) = @_;
2372		2595
2373	# TODO: use animation	2596	$self->{other}->toggle_visibility;
2374	if ($self->{state} = !$self->{state}) {
2375	$CFClient::UI::ROOT->add ($self->{other});
2376	$self->{other}->move ($self->coord2global (0, $self->{h}));
2377	$self->emit ("open");
2378	} else {
2379	$CFClient::UI::ROOT->remove ($self->{other});
2380	$self->emit ("close");
2381	}
2382
2383	$self->emit (changed => $self->{state});
2384	}	2597	}
2385		2598
2386	#############################################################################	2599	#############################################################################
2387		2600
2388	package CFClient::UI::Tooltip;	2601	package CFClient::UI::Tooltip;
…		…
2402		2615
2403	sub set_tooltip_from {	2616	sub set_tooltip_from {
2404	my ($self, $widget) = @_;	2617	my ($self, $widget) = @_;
2405		2618
2406	$self->add (new CFClient::UI::Label	2619	$self->add (new CFClient::UI::Label
2407	markup => $widget->{tooltip},	2620	markup => $widget->{tooltip},
2408	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409	fontsize => 0.8,	2622	fontsize => 0.8,
2410	fg => [0, 0, 0, 1],	2623	fg => [0, 0, 0, 1],
		2624	ellipsise => 0,
2411	font => ($widget->{tooltip_font} || $::FONT_PROP),	2625	font => ($widget->{tooltip_font} || $::FONT_PROP),
2412	);	2626	);
2413	}	2627	}
2414		2628
2415	sub size_request {	2629	sub size_request {
2416	my ($self) = @_;	2630	my ($self) = @_;
…		…
2419		2633
2420	($w + 4, $h + 4)	2634	($w + 4, $h + 4)
2421	}	2635	}
2422		2636
2423	sub size_allocate {	2637	sub size_allocate {
2424	my ($self, $w, $h) = @_;	2638	my ($self, $w, $h, $changed) = @_;
2425		2639
		2640	return unless $changed;
		2641
2426	$self->SUPER::size_allocate ($w - 4, $h - 4);	2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2427	}	2643	}
2428		2644
2429	sub _draw {	2645	sub _draw {
2430	my ($self) = @_;	2646	my ($self) = @_;
2431		2647
…		…
2462	use CFClient::OpenGL;	2678	use CFClient::OpenGL;
2463		2679
2464	sub new {	2680	sub new {
2465	my $class = shift;	2681	my $class = shift;
2466		2682
2467	$class->SUPER::new (	2683	my $self = $class->SUPER::new (
2468	aspect => 1,	2684	aspect => 1,
		2685	can_events => 0,
2469	@_,	2686	@_,
2470	)	2687	);
		2688
		2689	if ($self->{anim} && $self->{animspeed}) {
		2690	Scalar::Util::weaken (my $widget = $self);
		2691
		2692	$self->{timer} = Event->timer (
		2693	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2694	hard => 1,
		2695	interval => $self->{animspeed},
		2696	cb => sub {
		2697	++$widget->{frame};
		2698	$widget->update;
		2699	},
		2700	);
		2701	}
		2702
		2703	$self
2471	}	2704	}
2472		2705
2473	sub size_request {	2706	sub size_request {
2474	(32, 8)	2707	(32, 8)
2475	}	2708	}
2476		2709
		2710	sub update {
		2711	my ($self) = @_;
		2712
		2713	return unless $self->{visible};
		2714
		2715	$self->SUPER::update;
		2716	}
		2717
2477	sub _draw {	2718	sub _draw {
2478	my ($self) = @_;	2719	my ($self) = @_;
2479		2720
2480	return unless $::CONN;#d# manage and cache textures differently	2721	return unless $::CONN;
		2722
		2723	my $face;
		2724
		2725	if ($self->{frame}) {
		2726	my $anim = $::CONN->{anim}[$self->{anim}];
		2727
		2728	$face = $anim->[ $self->{frame} % @$anim ]
		2729	if $anim && @$anim;
		2730	}
		2731
2481	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2732	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482		2733
2483	# TODO animation
2484	if ($tex) {	2734	if ($tex) {
2485	glEnable GL_TEXTURE_2D;	2735	glEnable GL_TEXTURE_2D;
2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2736	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487	glColor 1, 1, 1, 1;	2737	glColor 1, 1, 1, 1;
2488	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2738	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489	glDisable GL_TEXTURE_2D;	2739	glDisable GL_TEXTURE_2D;
2490	}	2740	}
2491	}	2741	}
2492		2742
2493	#############################################################################	2743	sub DESTROY {
		2744	my ($self) = @_;
2494		2745
		2746	$self->{timer}->cancel
		2747	if $self->{timer};
		2748
		2749	$self->SUPER::DESTROY;
		2750	}
		2751
		2752	#############################################################################
		2753
2495	package CFClient::UI::InventoryItem;	2754	package CFClient::UI::Inventory;
2496		2755
2497	our @ISA = CFClient::UI::HBox::;	2756	our @ISA = CFClient::UI::ScrolledWindow::;
2498		2757
2499	sub new {	2758	sub new {
2500	my $class = shift;	2759	my $class = shift;
2501		2760
2502	my %args = @_;
2503
2504	my $item = delete $args{item};
2505
2506	my $desc = $item->{nrof} < 2
2507	? $item->{name}
2508	: "$item->{nrof} $item->{name_pl}";
2509
2510	$item->{flags} & Crossfire::Protocol::F_OPEN
2511	and $desc .= " (open)";
2512	$item->{flags} & Crossfire::Protocol::F_APPLIED
2513	and $desc .= " (applied)";
2514	$item->{flags} & Crossfire::Protocol::F_UNPAID
2515	and $desc .= " (unpaid)";
2516	$item->{flags} & Crossfire::Protocol::F_MAGIC
2517	and $desc .= " (magic)";
2518	$item->{flags} & Crossfire::Protocol::F_CURSED
2519	and $desc .= " (cursed)";
2520	$item->{flags} & Crossfire::Protocol::F_DAMNED
2521	and $desc .= " (damned)";
2522	$item->{flags} & Crossfire::Protocol::F_LOCKED
2523	and $desc .= " *";
2524
2525	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2526	can_hover => 1,	2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527	can_events => 1,
2528	tooltip => (CFClient::UI::Label->escape ($desc)
2529	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530	connect_button_down => sub {
2531	my ($self, $ev, $x, $y) = @_;
2532
2533	# todo: maybe put examine on 1? but should just be a tooltip :(
2534	if ($ev->{button} == 1) {
2535	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536	} elsif ($ev->{button} == 2) {
2537	$::CONN->send ("apply $item->{tag}");
2538	} elsif ($ev->{button} == 3) {
2539	my @menu_items = (
2540	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544	[
2545	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547	],
2548	);
2549
2550	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551	}
2552
2553	1
2554	},
2555	%args
2556	);
2557
2558	$self->add (new CFClient::UI::Face
2559	can_events => 0,
2560	face => $item->{face},
2561	anim => $item->{anim},
2562	animspeed => $item->{animspeed},
2563	);
2564
2565	$self->add (new CFClient::UI::Label
2566	can_events => 0,
2567	text => $desc,
2568	);
2569
2570	$self
2571	}
2572
2573	#############################################################################
2574
2575	package CFClient::UI::Inventory;
2576
2577	our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579	sub new {
2580	my $class = shift;
2581
2582	my $self = $class->SUPER::new (
2583	scrolled => (new CFClient::UI::VBox),
2584	@_,	2763	@_,
2585	);	2764	);
2586		2765
2587	$self	2766	$self
2588	}	2767	}
…		…
2598	or ($a->{name} cmp $b->{name})	2777	or ($a->{name} cmp $b->{name})
2599	} @$items;	2778	} @$items;
2600		2779
2601	$self->{real_items} = \@items;	2780	$self->{real_items} = \@items;
2602		2781
		2782	my $row = 0;
2603	for my $item (@items) {	2783	for my $item (@items) {
2604	my $desc = $item->{nrof} < 2	2784	CFClient::Item::update_widgets $item;
2605	? $item->{name}
2606	: "$item->{nrof} $item->{name_pl}";
2607		2785
2608	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2609	}	2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2610		2789
2611	$self->{scrolled}->add (@items);	2790	$row++;
2612		2791	}
2613	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614	}
2615
2616	sub size_request {
2617	my ($self) = @_;
2618	($self->{req_w}, $self->{req_h});
2619	}	2792	}
2620		2793
2621	#############################################################################	2794	#############################################################################
2622		2795
2623	package CFClient::UI::Menu;	2796	package CFClient::UI::Menu;
…		…
2658		2831
2659	# popup given the event (must be a mouse button down event currently)	2832	# popup given the event (must be a mouse button down event currently)
2660	sub popup {	2833	sub popup {
2661	my ($self, $ev) = @_;	2834	my ($self, $ev) = @_;
2662		2835
2663	$self->emit ("popdown");	2836	$self->_emit ("popdown");
2664		2837
2665	# maybe save $GRAB? must be careful about events...	2838	# maybe save $GRAB? must be careful about events...
2666	$GRAB = $self;	2839	$GRAB = $self;
2667	$self->{button} = $ev->{button};	2840	$self->{button} = $ev->{button};
2668		2841
…		…
2683		2856
2684	if ($ev->{button} == $self->{button}) {	2857	if ($ev->{button} == $self->{button}) {
2685	undef $GRAB;	2858	undef $GRAB;
2686	$self->hide;	2859	$self->hide;
2687		2860
2688	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2689	$self->{hover}[1]->() if $self->{hover};	2862	$self->{hover}[1]->() if $self->{hover};
2690	}	2863	}
2691	}	2864	}
2692		2865
2693	#############################################################################	2866	#############################################################################
2694		2867
2695	package CFClient::UI::Statusbox;	2868	package CFClient::UI::Statusbox;
2696		2869
2697	our @ISA = CFClient::UI::VBox::;	2870	our @ISA = CFClient::UI::VBox::;
		2871
		2872	sub new {
		2873	my $class = shift;
		2874
		2875	$class->SUPER::new (
		2876	fontsize => 0.8,
		2877	@_,
		2878	)
		2879	}
2698		2880
2699	sub reorder {	2881	sub reorder {
2700	my ($self) = @_;	2882	my ($self) = @_;
2701	my $NOW = time;	2883	my $NOW = time;
2702		2884
…		…
2722	: $item->{text};	2904	: $item->{text};
2723		2905
2724	for ($short) {	2906	for ($short) {
2725	s/^\s+//;	2907	s/^\s+//;
2726	s/\s+/ /g;	2908	s/\s+/ /g;
2727	my $len = int 40 / $item->{fontsize};
2728	substr $_, $len, length, "…" if $len < length;
2729	}	2909	}
2730		2910
2731	new CFClient::UI::Label	2911	new CFClient::UI::Label
2732	markup => $short,	2912	markup => $short,
2733	tooltip => $item->{tooltip},	2913	tooltip => $item->{tooltip},
2734	tooltip_font => $::FONT_PROP,	2914	tooltip_font => $::FONT_PROP,
2735	tooltip_width => 0.67,	2915	tooltip_width => 0.67,
2736	fontsize => $item->{fontsize},	2916	fontsize => $item->{fontsize} || $self->{fontsize},
		2917	max_w => $::WIDTH * 0.44,
2737	fg => $item->{fg},	2918	fg => $item->{fg},
2738	can_events => 1,	2919	can_events => 1,
2739	can_hover => 1	2920	can_hover => 1
2740	};	2921	};
2741	}	2922	}
…		…
2747	sub add {	2928	sub add {
2748	my ($self, $text, %arg) = @_;	2929	my ($self, $text, %arg) = @_;
2749		2930
2750	$text =~ s/^\s+//;	2931	$text =~ s/^\s+//;
2751	$text =~ s/\s+$//;	2932	$text =~ s/\s+$//;
		2933
		2934	return unless $text;
2752		2935
2753	my $timeout = time + ((delete $arg{timeout}) || 60);	2936	my $timeout = time + ((delete $arg{timeout}) || 60);
2754		2937
2755	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756		2939
…		…
2768	$self->{item}{$group} = {	2951	$self->{item}{$group} = {
2769	id => ++$self->{id},	2952	id => ++$self->{id},
2770	text => $text,	2953	text => $text,
2771	timeout => $timeout,	2954	timeout => $timeout,
2772	tooltip => $text,	2955	tooltip => $text,
2773	fontsize => 0.8,
2774	fg => [0.8, 0.8, 0.8, 0.8],	2956	fg => [0.8, 0.8, 0.8, 0.8],
2775	pri => 0,	2957	pri => 0,
2776	count => 1,	2958	count => 1,
2777	%arg,	2959	%arg,
2778	};	2960	};
2779	}	2961	}
2780		2962
2781	$self->reorder;	2963	$self->reorder;
2782	}	2964	}
2783		2965
		2966	sub reconfigure {
		2967	my ($self) = @_;
		2968
		2969	delete $_->{label}
		2970	for values %{ $self->{item} || {} };
		2971
		2972	$self->reorder;
		2973	$self->SUPER::reconfigure;
		2974	}
		2975
2784	#############################################################################	2976	#############################################################################
2785		2977
2786	package CFClient::UI::Root;	2978	package CFClient::UI::Root;
2787		2979
2788	our @ISA = CFClient::UI::Container::;	2980	our @ISA = CFClient::UI::Container::;
…		…
2790	use CFClient::OpenGL;	2982	use CFClient::OpenGL;
2791		2983
2792	sub new {	2984	sub new {
2793	my $class = shift;	2985	my $class = shift;
2794		2986
2795	$class->SUPER::new (	2987	my $self = $class->SUPER::new (
		2988	visible => 1,
2796	@_,	2989	@_,
2797	)	2990	);
		2991
		2992	Scalar::Util::weaken ($self->{root} = $self);
		2993
		2994	$self
2798	}	2995	}
2799		2996
2800	sub configure {	2997	sub configure {
2801	my ($self, $x, $y, $w, $h) = @_;	2998	my ($self, $x, $y, $w, $h) = @_;
2802		2999
2803	$self->{w} = $w;	3000	$self->{w} = $w;
2804	$self->{h} = $h;	3001	$self->{h} = $h;
2805	}	3002	}
2806		3003
2807	sub check_size {	3004	sub reconfigure {
2808	my ($self) = @_;	3005	my ($self) = @_;
2809		3006
		3007	$self->SUPER::reconfigure;
		3008
2810	$self->size_allocate ($self->{w}, $self->{h})	3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
2811	if $self->{w};	3010	if $self->{w};
2812	}	3011	}
2813		3012
2814	sub size_request {	3013	sub size_request {
2815	my ($self) = @_;	3014	my ($self) = @_;
2816		3015
2817	($self->{w}, $self->{h})	3016	($self->{w}, $self->{h})
2818	}	3017	}
2819		3018
2820	sub size_allocate {	3019	sub size_allocate {
2821	my ($self, $w, $h) = @_;	3020	my ($self, $w, $h, $changed) = @_;
2822
2823	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828		3021
2829	for my $child ($self->children) {	3022	for my $child ($self->children) {
2830	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831		3024
2832	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833	if exists $child->{req_x};	3026	if exists $child->{req_x};
2834		3027
2835	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836	if exists $child->{req_y};	3029	if exists $child->{req_y};
2837		3030
		3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3032
2838	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840		3035
2841	$child->configure ($X, $Y, $W, $H);	3036	$child->configure ($X, $Y, $W, $H);
2842	}	3037	}
…		…
2855	}	3050	}
2856		3051
2857	sub update {	3052	sub update {
2858	my ($self) = @_;	3053	my ($self) = @_;
2859		3054
2860	$self->check_size;
2861	$::WANT_REFRESH++;	3055	$::WANT_REFRESH++;
2862	}	3056	}
2863		3057
2864	sub add {	3058	sub add {
2865	my ($self, @children) = @_;	3059	my ($self, @children) = @_;
2866		3060
2867	for my $child (@children) {	3061	for my $child (@children) {
2868	$child->{toplevel} = 1;	3062	$child->{is_toplevel} = 1;
2869		3063
2870	# integerise window positions	3064	# integerise window positions
2871	$child->{x} = int $child->{x};	3065	$child->{x} = int $child->{x};
2872	$child->{y} = int $child->{y};	3066	$child->{y} = int $child->{y};
2873	}	3067	}
2874		3068
2875	$self->SUPER::add (@children);	3069	$self->SUPER::add (@children);
2876	}	3070	}
2877		3071
		3072	sub remove {
		3073	my ($self, @children) = @_;
		3074
		3075	$self->SUPER::remove (@children);
		3076
		3077	while (@children) {
		3078	my $w = pop @children;
		3079	push @children, $w->children;
		3080	$w->set_invisible;
		3081	}
		3082	}
		3083
2878	sub on_refresh {	3084	sub on_refresh {
2879	my ($self, $id, $cb) = @_;	3085	my ($self, $id, $cb) = @_;
2880		3086
2881	$self->{refresh_hook}{$id} = $cb;	3087	$self->{refresh_hook}{$id} = $cb;
2882	}	3088	}
…		…
2893	while ($self->{refresh_hook}) {	3099	while ($self->{refresh_hook}) {
2894	$_->()	3100	$_->()
2895	for values %{delete $self->{refresh_hook}};	3101	for values %{delete $self->{refresh_hook}};
2896	}	3102	}
2897		3103
2898	if ($self->{check_size}) {	3104	if ($self->{realloc}) {
2899	my @queue = ([], []);	3105	my @queue;
2900		3106
2901	for (;;) {	3107	while () {
2902	if ($self->{check_size}) {	3108	if ($self->{realloc}) {
2903	# heuristic: check containers last	3109	#TODO use array-of-depth approach
2904	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3110
2905	for values %{delete $self->{check_size}}	3111	@queue = sort { $a->{visible} <=> $b->{visible} }
		3112	@queue, values %{delete $self->{realloc}};
2906	}	3113	}
2907		3114
2908	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3115	my $widget = pop @queue || last;
2909		3116
		3117	$widget->{visible} or last; # do not resize invisible widgets
		3118
2910	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2911	? @$widget{qw(user_w user_h)}	3120	? @$widget{qw(def_w def_h)}
2912	: $widget->size_request;	3121	: $widget->size_request;
2913		3122
2914	if (delete $widget->{force_alloc}
2915	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917		3124
2918	$widget->{req_w} = $w;	3125	$widget->{req_w} = $w;
2919	$widget->{req_h} = $h;	3126	$widget->{req_h} = $h;
2920		3127
2921	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2922		3129
2923	$widget->{parent}->check_size	3130	push @queue, $widget->{parent}
2924	if $widget->{parent};	3131	if $widget->{parent};
2925	}
2926	}	3132	}
2927	}	3133	}
2928		3134
2929	while ($self->{size_alloc}) {	3135	while (my $size_alloc = delete $self->{size_alloc}) {
2930	for (values %{delete $self->{size_alloc}}) {	3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2931	my ($widget, $w, $h) = @$_;	3137	values %$size_alloc;
		3138
		3139	while () {
		3140	my ($widget, $w, $h) = @{ pop @queue or last };
2932		3141
2933	$w = 0 if $w < 0;	3142	$w = 0 if $w < 0;
2934	$h = 0 if $h < 0;	3143	$h = 0 if $h < 0;
2935		3144
2936	$widget->{w} = $w;	3145	$widget->{w} = $w;
2937	$widget->{h} = $h;	3146	$widget->{h} = $h;
2938	$widget->size_allocate ($w, $h);
2939	$widget->emit (size_allocate => $w, $h);	3147	$widget->emit (size_allocate => $w, $h, 1);
2940	}	3148	}
2941	}	3149	}
2942		3150
2943	while ($self->{post_alloc_hook}) {	3151	while ($self->{post_alloc_hook}) {
2944	$_->()	3152	$_->()
…		…
2949	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3157	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950	glClear GL_COLOR_BUFFER_BIT;	3158	glClear GL_COLOR_BUFFER_BIT;
2951		3159
2952	glMatrixMode GL_PROJECTION;	3160	glMatrixMode GL_PROJECTION;
2953	glLoadIdentity;	3161	glLoadIdentity;
2954	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955	glMatrixMode GL_MODELVIEW;	3163	glMatrixMode GL_MODELVIEW;
2956	glLoadIdentity;	3164	glLoadIdentity;
2957		3165
2958	$self->_draw;	3166	$self->_draw;
2959	}	3167	}
…		…
2961	#############################################################################	3169	#############################################################################
2962		3170
2963	package CFClient::UI;	3171	package CFClient::UI;
2964		3172
2965	$ROOT = new CFClient::UI::Root;	3173	$ROOT = new CFClient::UI::Root;
2966	$TOOLTIP = new CFClient::UI::Tooltip;	3174	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967		3175
2968	1	3176	1
2969		3177

Diff Legend

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