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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
26		55
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	56	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	57	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	58	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	59	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		60
		61	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	62	}
32		63
33	$layout	64	$layout
34	}	65	}
35		66
36	sub set_layout {	67	sub set_layout {
37	my ($layout) = @_;	68	my ($layout) = @_;
		69
38	$LAYOUT = $layout;	70	$LAYOUT = $layout;
39	}
40
41	sub check_tooltip {
42	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;
48
49	$TOOLTIP->{owner} = $widget;
50
51	my $tip = $widget->{tooltip};
52
53	$tip = $tip->($widget) if CODE:: eq ref $tip;
54
55	$TOOLTIP->set_tooltip_from ($widget);
56	$TOOLTIP->show;
57	}
58
59	return;
60	}
61	}
62	}
63
64	$TOOLTIP->hide;
65	delete $TOOLTIP->{owner};
66	}	71	}
67		72
68	# class methods for events	73	# class methods for events
69	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
70	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
…		…
74	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
75	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
76	if $FOCUS;	81	if $FOCUS;
77	}	82	}
78		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
79	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
80	my ($ev) = @_;	98	my ($ev) = @_;
81	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
82		100
83	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
84	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
85		105
86	$GRAB = $widget;	106	$GRAB = $widget;
87	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
88		108
89	check_tooltip;	109	$TOOLTIP_WATCHER->cb->();
90	}	110	}
91		111
92	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
93		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
94	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
95	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
96	}	122	}
97		123
98	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
99	my ($ev) = @_;	125	my ($ev) = @_;
100	my ($x, $y) = ($ev->{x}, $ev->{y});
101		126
102	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
103		128
104	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
105		130
106	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
107	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
108		133
109	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
110	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
111	$grab->update if $grab;	136	$grab->update if $grab;
112	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
113		138
114	check_tooltip;	139	check_hover $widget;
		140	$TOOLTIP_WATCHER->cb->();
115	}	141	}
116	}	142	}
117		143
118	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
119	my ($ev) = @_;	145	my ($ev) = @_;
120	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
121		147
122	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
123		149
124	if ($widget != $HOVER) {	150	check_hover $widget;
125	my $hover = $HOVER; $HOVER = $widget;
126		151
127	$hover->update if $hover && $hover->{can_hover};	152	$HOVER->emit (mouse_motion => $ev)
128	$HOVER->update if $HOVER && $HOVER->{can_hover};
129
130	check_tooltip;
131	}
132
133	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134	if $HOVER;	153	if $HOVER;
135	}	154	}
136		155
137	# convert position array to integers	156	# convert position array to integers
138	sub harmonize {	157	sub harmonize {
…		…
167	sub rescale_widgets {	186	sub rescale_widgets {
168	my ($sx, $sy) = @_;	187	my ($sx, $sy) = @_;
169		188
170	for my $widget (values %WIDGET) {	189	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	190	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	191	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	192	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		193
175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	194	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	195	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	196	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	197	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	198	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	199	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181		200
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	201	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	202	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		203
185	}	204	}
186	}	205	}
187		206
188	reconfigure_widgets;	207	reconfigure_widgets;
		208	}
		209
		210	#############################################################################
		211
		212	package CFClient::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
189	}	216	}
190		217
191	#############################################################################	218	#############################################################################
192		219
193	package CFClient::UI::Base;	220	package CFClient::UI::Base;
…		…
207	h => undef,	234	h => undef,
208	can_events => 1,	235	can_events => 1,
209	@_	236	@_
210	}, $class;	237	}, $class;
211		238
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);	239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		240
224	for (keys %$self) {	241	for (keys %$self) {
225	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
227	}	244	}
228	}	245	}
229		246
		247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		252
		253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		255
		256	$self->show if $layout->{show};
		257	}
		258
230	$self	259	$self
231	}	260	}
232		261
233	sub destroy {	262	sub destroy {
234	my ($self) = @_;	263	my ($self) = @_;
…		…
265		294
266	return unless $self->{visible};	295	return unless $self->{visible};
267		296
268	$_->set_invisible for $self->children;	297	$_->set_invisible for $self->children;
269		298
		299	delete $self->{visible};
270	delete $self->{root};	300	delete $self->{root};
271	delete $self->{visible};
272		301
273	undef $GRAB if $GRAB == $self;	302	undef $GRAB if $GRAB == $self;
274	undef $HOVER if $HOVER == $self;	303	undef $HOVER if $HOVER == $self;
275		304
276	CFClient::UI::check_tooltip	305	$CFClient::UI::TOOLTIP_WATCHER->cb->()
277	if $TOOLTIP->{owner} == $self;	306	if $TOOLTIP->{owner} == $self;
278		307
279	$self->focus_out;	308	$self->emit ("focus_out");
280
281	$self->emit (visibility_change => 0);	309	$self->emit (visibility_change => 0);
282	}	310	}
283		311
284	sub set_visibility {	312	sub set_visibility {
285	my ($self, $visible) = @_;	313	my ($self, $visible) = @_;
…		…
308	}	336	}
309		337
310	sub move_abs {	338	sub move_abs {
311	my ($self, $x, $y, $z) = @_;	339	my ($self, $x, $y, $z) = @_;
312		340
313	$self->{x} = List::Util::max 0, int $x;	341	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314	$self->{y} = List::Util::max 0, int $y;	342	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315	$self->{z} = $z if defined $z;	343	$self->{z} = $z if defined $z;
316		344
317	$self->update;	345	$self->update;
318	}	346	}
319		347
…		…
329	sub size_request {	357	sub size_request {
330	require Carp;	358	require Carp;
331	Carp::confess "size_request is abstract";	359	Carp::confess "size_request is abstract";
332	}	360	}
333		361
		362	sub baseline_shift {
		363	0
		364	}
		365
334	sub configure {	366	sub configure {
335	my ($self, $x, $y, $w, $h) = @_;	367	my ($self, $x, $y, $w, $h) = @_;
336		368
337	if ($self->{aspect}) {	369	if ($self->{aspect}) {
338	my ($ow, $oh) = ($w, $h);	370	my ($ow, $oh) = ($w, $h);
339		371
340	$w = List::Util::min $w, int $h * $self->{aspect};	372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
341	$h = List::Util::min $h, int $w / $self->{aspect};	373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
342		374
343	# use alignment to adjust x, y	375	# use alignment to adjust x, y
344		376
345	$x += int 0.5 * ($ow - $w);	377	$x += int 0.5 * ($ow - $w);
346	$y += int 0.5 * ($oh - $h);	378	$y += int 0.5 * ($oh - $h);
…		…
350	$self->{x} = $x;	382	$self->{x} = $x;
351	$self->{y} = $y;	383	$self->{y} = $y;
352	$self->update;	384	$self->update;
353	}	385	}
354		386
355	if ($self->{w} != $w || $self->{h} != $h) {	387	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356	return unless $self->{visible};	388	return unless $self->{visible};
357		389
		390	$self->{alloc_w} = $w;
		391	$self->{alloc_h} = $h;
		392
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	393	$self->{root}{size_alloc}{$self+0} = $self;
359	}	394	}
360	}
361
362	sub size_allocate {
363	# nothing to be done
364	}	395	}
365		396
366	sub children {	397	sub children {
		398	# nop
		399	}
		400
		401	sub visible_children {
		402	$_[0]->children
367	}	403	}
368		404
369	sub set_max_size {	405	sub set_max_size {
370	my ($self, $w, $h) = @_;	406	my ($self, $w, $h) = @_;
371		407
372	delete $self->{max_w}; $self->{max_w} = $w if $w;	408	$self->{max_w} = int $w if defined $w;
373	delete $self->{max_h}; $self->{max_h} = $h if $h;	409	$self->{max_h} = int $h if defined $h;
		410
		411	$self->realloc;
374	}	412	}
375		413
376	sub set_tooltip {	414	sub set_tooltip {
377	my ($self, $tooltip) = @_;	415	my ($self, $tooltip) = @_;
378		416
…		…
383		421
384	$self->{tooltip} = $tooltip;	422	$self->{tooltip} = $tooltip;
385		423
386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387	delete $CFClient::UI::TOOLTIP->{owner};	425	delete $CFClient::UI::TOOLTIP->{owner};
388	CFClient::UI::check_tooltip;	426	$CFClient::UI::TOOLTIP_WATCHER->cb->();
389	}	427	}
390	}	428	}
391		429
392	# translate global coordinates to local coordinate system	430	# translate global coordinates to local coordinate system
393	sub coord2local {	431	sub coord2local {
394	my ($self, $x, $y) = @_;	432	my ($self, $x, $y) = @_;
395		433
		434	Carp::confess unless $self->{parent};#d#
		435
396	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	436	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
397	}	437	}
398		438
399	# translate local coordinates to global coordinate system	439	# translate local coordinates to global coordinate system
400	sub coord2global {	440	sub coord2global {
401	my ($self, $x, $y) = @_;	441	my ($self, $x, $y) = @_;
402		442
		443	Carp::confess unless $self->{parent};#d#
		444
403	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	445	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404	}	446	}
405		447
406	sub focus_in {	448	sub invoke_focus_in {
407	my ($self) = @_;	449	my ($self) = @_;
408		450
409	return if $FOCUS == $self;	451	return if $FOCUS == $self;
410	return unless $self->{can_focus};	452	return unless $self->{can_focus};
411		453
412	my $focus = $FOCUS; $FOCUS = $self;	454	$FOCUS = $self;
413		455
414	$self->_emit (focus_in => $focus);	456	$self->update;
415		457
416	$focus->update if $focus;	458	0
417	$FOCUS->update;
418	}	459	}
419		460
420	sub focus_out {	461	sub invoke_focus_out {
421	my ($self) = @_;	462	my ($self) = @_;
422		463
423	return unless $FOCUS == $self;	464	return unless $FOCUS == $self;
424		465
425	my $focus = $FOCUS; undef $FOCUS;	466	undef $FOCUS;
426		467
427	$self->_emit (focus_out => $focus);	468	$self->update;
428		469
429	$focus->update if $focus; #?
430
431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	470	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432	unless $FOCUS;	471	unless $FOCUS;
433	}
434		472
		473	0
		474	}
		475
		476	sub grab_focus {
		477	my ($self) = @_;
		478
		479	$FOCUS->emit ("focus_out") if $FOCUS;
		480	$self->emit ("focus_in");
		481	}
		482
435	sub mouse_motion { }	483	sub invoke_mouse_motion { 0 }
436	sub button_up { }	484	sub invoke_button_up { 0 }
437	sub key_down { }	485	sub invoke_key_down { 0 }
438	sub key_up { }	486	sub invoke_key_up { 0 }
		487	sub invoke_mouse_wheel { 0 }
439		488
440	sub button_down {	489	sub invoke_button_down {
441	my ($self, $ev, $x, $y) = @_;	490	my ($self, $ev, $x, $y) = @_;
442		491
443	$self->focus_in;	492	$self->grab_focus;
444	}
445		493
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	494	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	495	}
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	496
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	497	sub connect {
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	498	my ($self, $signal, $cb) = @_;
		499
		500	push @{ $self->{signal_cb}{$signal} }, $cb;
		501
		502	defined wantarray and CFClient::guard {
		503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		504	@{ $self->{signal_cb}{$signal} };
		505	}
		506	}
		507
		508	my %has_coords = (
		509	button_down => 1,
		510	button_up => 1,
		511	mouse_motion => 1,
		512	mouse_wheel => 1,
		513	);
		514
		515	sub emit {
		516	my ($self, $signal, @args) = @_;
		517
		518	# I do not really like this solution, but I dislike duplication
		519	# and needlessly verbose code, too.
		520	my @append
		521	= $has_coords{$signal}
		522	? $args[0]->xy ($self)
		523	: ();
		524
		525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		526
		527	#d##TODO# stop propagating at first true, do not use sum
		528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		531	}
451		532
452	sub find_widget {	533	sub find_widget {
453	my ($self, $x, $y) = @_;	534	my ($self, $x, $y) = @_;
454		535
455	return () unless $self->{can_events};	536	return () unless $self->{can_events};
…		…
463		544
464	sub set_parent {	545	sub set_parent {
465	my ($self, $parent) = @_;	546	my ($self, $parent) = @_;
466		547
467	Scalar::Util::weaken ($self->{parent} = $parent);	548	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	549	$self->set_visible if $parent->{visible};
470	}	550	}
471		551
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 {	552	sub realloc {
496	my ($self) = @_;	553	my ($self) = @_;
497		554
498	if ($self->{visible}) {	555	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	556	return if $self->{root}{realloc}{$self+0};
500		557
501	$self->{root}{realloc}{$self} = $self;	558	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	559	$self->{root}->update;
503	} else {	560	} else {
504	delete $self->{req_w};	561	delete $self->{req_w};
		562	delete $self->{req_h};
505	}	563	}
506	}	564	}
507		565
508	sub update {	566	sub update {
509	my ($self) = @_;	567	my ($self) = @_;
…		…
517		575
518	$self->realloc;	576	$self->realloc;
519	$self->update;	577	$self->update;
520	}	578	}
521		579
		580	# using global variables seems a bit hacky, but passing through all drawing
		581	# functions seems pointless.
		582	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		583
522	sub draw {	584	sub draw {
523	my ($self) = @_;	585	my ($self) = @_;
524		586
525	return unless $self->{h} && $self->{w};	587	return unless $self->{h} && $self->{w};
		588
		589	# update screen rectangle
		590	local $draw_x = $draw_x + $self->{x};
		591	local $draw_y = $draw_y + $self->{y};
		592
		593	# skip widgets that are entirely outside the drawing area
		594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526		596
527	glPushMatrix;	597	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	598	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;
530	glPopMatrix;
531		599
532	if ($self == $HOVER && $self->{can_hover}) {	600	if ($self == $HOVER && $self->{can_hover}) {
533	my ($x, $y) = @$self{qw(x y)};
534
535	glColor 1, 0.8, 0.5, 0.2;	601	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536	glEnable GL_BLEND;	602	glEnable GL_BLEND;
537	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538	glBegin GL_QUADS;	604	glBegin GL_QUADS;
539	glVertex $x , $y;	605	glVertex 0 , 0;
540	glVertex $x + $self->{w}, $y;	606	glVertex $self->{w}, 0;
541	glVertex $x + $self->{w}, $y + $self->{h};	607	glVertex $self->{w}, $self->{h};
542	glVertex $x , $y + $self->{h};	608	glVertex 0 , $self->{h};
543	glEnd;	609	glEnd;
544	glDisable GL_BLEND;	610	glDisable GL_BLEND;
545	}	611	}
546		612
547	if ($ENV{CFPLUS_DEBUG}) {	613	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	614	glPushMatrix;
549	glColor 1, 1, 0, 1;	615	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	616	glTranslate 0.375, 0.375;
551	glBegin GL_LINE_LOOP;	617	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	618	glVertex 0 , 0;
553	glVertex $self->{w} - 1, 0;	619	glVertex $self->{w} - 1, 0;
554	glVertex $self->{w} - 1, $self->{h} - 1;	620	glVertex $self->{w} - 1, $self->{h} - 1;
555	glVertex 0 , $self->{h} - 1;	621	glVertex 0 , $self->{h} - 1;
556	glEnd;	622	glEnd;
557	glPopMatrix;	623	glPopMatrix;
558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559	}	625	}
		626
		627	$self->_draw;
		628	glPopMatrix;
560	}	629	}
561		630
562	sub _draw {	631	sub _draw {
563	my ($self) = @_;	632	my ($self) = @_;
564		633
…		…
566	}	635	}
567		636
568	sub DESTROY {	637	sub DESTROY {
569	my ($self) = @_;	638	my ($self) = @_;
570		639
		640	return if CFClient::in_destruct;
		641
571	delete $WIDGET{$self+0};	642	delete $WIDGET{$self+0};
572	#$self->deactivate;	643
		644	eval { $self->destroy };
		645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573	}	646	}
574		647
575	#############################################################################	648	#############################################################################
576		649
577	package CFClient::UI::DrawBG;	650	package CFClient::UI::DrawBG;
…		…
602		675
603	if ($color && (@$color < 4 || $color->[3])) {	676	if ($color && (@$color < 4 || $color->[3])) {
604	my ($w, $h) = @$self{qw(w h)};	677	my ($w, $h) = @$self{qw(w h)};
605		678
606	glEnable GL_BLEND;	679	glEnable GL_BLEND;
607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608	glColor @$color;	681	glColor_premultiply @$color;
609		682
610	glBegin GL_QUADS;	683	glBegin GL_QUADS;
611	glVertex 0 , 0;	684	glVertex 0 , 0;
612	glVertex 0 , $h;	685	glVertex 0 , $h;
613	glVertex $w, $h;	686	glVertex $w, $h;
…		…
644	our @ISA = CFClient::UI::Base::;	717	our @ISA = CFClient::UI::Base::;
645		718
646	sub new {	719	sub new {
647	my ($class, %arg) = @_;	720	my ($class, %arg) = @_;
648		721
649	my $children = delete $arg{children} || [];	722	my $children = delete $arg{children};
650		723
651	my $self = $class->SUPER::new (	724	my $self = $class->SUPER::new (
652	children => [],	725	children => [],
653	can_events => 0,	726	can_events => 0,
654	%arg,	727	%arg,
655	);	728	);
		729
656	$self->add ($_) for @$children;	730	$self->add (@$children)
		731	if $children;
657		732
658	$self	733	$self
		734	}
		735
		736	sub realloc {
		737	my ($self) = @_;
		738
		739	$self->{force_realloc} = 1;
		740	$self->{force_size_alloc} = 1;
		741	$self->SUPER::realloc;
659	}	742	}
660		743
661	sub add {	744	sub add {
662	my ($self, @widgets) = @_;	745	my ($self, @widgets) = @_;
663		746
…		…
709	$x -= $self->{x};	792	$x -= $self->{x};
710	$y -= $self->{y};	793	$y -= $self->{y};
711		794
712	my $res;	795	my $res;
713		796
714	for (reverse @{ $self->{children} }) {	797	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	798	$res = $_->find_widget ($x, $y)
716	and return $res;	799	and return $res;
717	}	800	}
718		801
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	802	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
740	}	823	}
741		824
742	sub add {	825	sub add {
743	my ($self, $child) = @_;	826	my ($self, $child) = @_;
744		827
745	$self->{children} = [];	828	$self->SUPER::remove ($_) for @{ $self->{children} };
746
747	$self->SUPER::add ($child);	829	$self->SUPER::add ($child);
748	}	830	}
749		831
750	sub remove {	832	sub remove {
751	my ($self, $widget) = @_;	833	my ($self, $widget) = @_;
…		…
760		842
761	sub size_request {	843	sub size_request {
762	$_[0]{children}[0]->size_request	844	$_[0]{children}[0]->size_request
763	}	845	}
764		846
765	sub size_allocate {	847	sub invoke_size_allocate {
766	my ($self, $w, $h, $changed) = @_;	848	my ($self, $w, $h) = @_;
767		849
768	$self->{children}[0]->configure (0, 0, $w, $h);	850	$self->{children}[0]->configure (0, 0, $w, $h);
		851
		852	1
769	}	853	}
770		854
771	#############################################################################	855	#############################################################################
		856
		857	# back-buffered drawing area
772		858
773	package CFClient::UI::Window;	859	package CFClient::UI::Window;
774		860
775	our @ISA = CFClient::UI::Bin::;	861	our @ISA = CFClient::UI::Bin::;
776		862
…		…
787		873
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	874	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	875	$self->SUPER::update;
790	}	876	}
791		877
792	sub size_allocate {	878	sub invoke_size_allocate {
793	my ($self, $w, $h, $changed) = @_;	879	my ($self, $w, $h) = @_;
794		880
795	$self->SUPER::size_allocate ($w, $h, $changed);
796	$self->update	881	$self->update;
797	if $changed;	882
		883	$self->SUPER::invoke_size_allocate ($w, $h)
798	}	884	}
799		885
800	sub _render {	886	sub _render {
		887	my ($self) = @_;
		888
801	$_[0]{children}[0]->draw;	889	$self->{children}[0]->draw;
802	}	890	}
803		891
804	sub render_child {	892	sub render_child {
805	my ($self) = @_;	893	my ($self) = @_;
806		894
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	896	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	897	glClear GL_COLOR_BUFFER_BIT;
810		898
		899	{
		900	package CFClient::UI::Base;
		901
		902	($draw_x, $draw_y, $draw_w, $draw_h) =
		903	(0, 0, $self->{w}, $self->{h});
		904	}
		905
811	$self->_render;	906	$self->_render;
812	};	907	};
813	}	908	}
814		909
815	sub _draw {	910	sub _draw {
816	my ($self) = @_;	911	my ($self) = @_;
817		912
818	my ($w, $h) = ($self->w, $self->h);	913	my ($w, $h) = @$self{qw(w h)};
819		914
820	my $tex = $self->{texture}	915	my $tex = $self->{texture}
821	or return;	916	or return;
822		917
823	glEnable GL_TEXTURE_2D;	918	glEnable GL_TEXTURE_2D;
824	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825	glColor 1, 1, 1, 1;	920	glColor 0, 0, 0, 1;
826		921
827	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828		923
829	glDisable GL_TEXTURE_2D;	924	glDisable GL_TEXTURE_2D;
830	}	925	}
…		…
846	}	941	}
847		942
848	sub size_request {	943	sub size_request {
849	my ($self) = @_;	944	my ($self) = @_;
850		945
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		947
853	$w = 10 if $self->{scroll_x};	948	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	949	$h = 10 if $self->{scroll_y};
855		950
856	($w, $h)	951	($w, $h)
857	}	952	}
858		953
859	sub size_allocate {	954	sub invoke_size_allocate {
860	my ($self, $w, $h, $changed) = @_;	955	my ($self, $w, $h) = @_;
861		956
		957	my $child = $self->child;
		958
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	959	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	960	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		961
865	$self->child->configure (0, 0, $w, $h);	962	$self->child->configure (0, 0, $w, $h);
866	$self->update;	963	$self->update;
		964
		965	1
867	}	966	}
868		967
869	sub set_offset {	968	sub set_offset {
870	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
871		970
…		…
904	}	1003	}
905		1004
906	sub _render {	1005	sub _render {
907	my ($self) = @_;	1006	my ($self) = @_;
908		1007
		1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		1010
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		1012
911	$self->SUPER::_render;	1013	$self->SUPER::_render;
912	}	1014	}
913		1015
…		…
916	package CFClient::UI::ScrolledWindow;	1018	package CFClient::UI::ScrolledWindow;
917		1019
918	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFClient::UI::HBox::;
919		1021
920	sub new {	1022	sub new {
921	my $class = shift;	1023	my ($class, %arg) = @_;
		1024
		1025	my $child = delete $arg{child};
922		1026
923	my $self;	1027	my $self;
924		1028
925	my $slider = new CFClient::UI::Slider	1029	my $slider = new CFClient::UI::Slider
926	vertical => 1,	1030	vertical => 1,
…		…
929	$self->{vp}->set_offset (0, $_[1]);	1033	$self->{vp}->set_offset (0, $_[1]);
930	},	1034	},
931	;	1035	;
932		1036
933	$self = $class->SUPER::new (	1037	$self = $class->SUPER::new (
934	vp => (new CFClient::UI::ViewPort expand => 1),	1038	vp => (new CFClient::UI::ViewPort expand => 1),
		1039	can_events => 1,
935	slider => $slider,	1040	slider => $slider,
936	@_,	1041	%arg,
937	);	1042	);
938		1043
939	$self->{vp}->add ($self->{scrolled});
940	$self->add ($self->{vp});
941	$self->add ($self->{slider});	1044	$self->SUPER::add ($self->{vp}, $self->{slider});
		1045	$self->add ($child) if $child;
942		1046
943	$self	1047	$self
944	}	1048	}
945		1049
		1050	#TODO# update range on size_allocate depending on child
		1051
		1052	sub add {
		1053	my ($self, $widget) = @_;
		1054
		1055	$self->{vp}->add ($self->{child} = $widget);
		1056	}
		1057
		1058	sub invoke_mouse_wheel {
		1059	my ($self, $ev) = @_;
		1060
		1061	return 0 unless $ev->{dy}; # only vertical movements
		1062
		1063	$self->{slider}->emit (mouse_wheel => $ev);
		1064
		1065	1
		1066	}
		1067
		1068	sub update_slider {
		1069	my ($self) = @_;
		1070
		1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1072	}
		1073
946	sub update {	1074	sub update {
947	my ($self) = @_;	1075	my ($self) = @_;
948		1076
949	$self->SUPER::update;	1077	$self->SUPER::update;
950		1078
951	# todo: overwrite size_allocate of child	1079	$self->update_slider;
952	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	1080	}
955		1081
956	sub size_allocate {	1082	sub invoke_size_allocate {
957	my ($self, $w, $h, $changed) = @_;	1083	my ($self, $w, $h) = @_;
958		1084
		1085	$self->update_slider;
		1086
959	$self->SUPER::size_allocate ($w, $h, $changed);	1087	$self->SUPER::invoke_size_allocate ($w, $h)
960
961	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1088	}
964
965	#TODO# update range on size_allocate depending on child
966	# update viewport offset on scroll
967		1089
968	#############################################################################	1090	#############################################################################
969		1091
970	package CFClient::UI::Frame;	1092	package CFClient::UI::Frame;
971		1093
…		…
987		1109
988	if ($self->{bg}) {	1110	if ($self->{bg}) {
989	my ($w, $h) = @$self{qw(w h)};	1111	my ($w, $h) = @$self{qw(w h)};
990		1112
991	glEnable GL_BLEND;	1113	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1114	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993	glColor @{ $self->{bg} };	1115	glColor_premultiply @{ $self->{bg} };
994		1116
995	glBegin GL_QUADS;	1117	glBegin GL_QUADS;
996	glVertex 0 , 0;	1118	glVertex 0 , 0;
997	glVertex 0 , $h;	1119	glVertex 0 , $h;
998	glVertex $w, $h;	1120	glVertex $w, $h;
…		…
1020	my @border =	1142	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1145
1024	sub new {	1146	sub new {
1025	my $class = shift;	1147	my ($class, %arg) = @_;
1026		1148
1027	my $self = $class->SUPER::new (	1149	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1150	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1151	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1152	border => 0.6,
1031	can_events => 1,	1153	can_events => 1,
1032	@_	1154	min_w => 64,
		1155	min_h => 32,
		1156	%arg,
1033	);	1157	);
1034		1158
1035	$self->{title} &&= new CFClient::UI::Label	1159	$self->{title_widget} = new CFClient::UI::Label
1036	align => 0,	1160	align => 0,
1037	valign => 1,	1161	valign => 1,
1038	text => $self->{title},	1162	text => $self->{title},
1039	fontsize => $self->{border};	1163	fontsize => $self->{border},
		1164	if exists $self->{title};
		1165
		1166	if ($self->{has_close_button}) {
		1167	$self->{close_button} =
		1168	new CFClient::UI::ImageButton
		1169	path => 'x1_close.png',
		1170	on_activate => sub { $self->emit ("delete") };
		1171
		1172	$self->CFClient::UI::Container::add ($self->{close_button});
		1173	}
1040		1174
1041	$self	1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1042	}	1184	}
1043		1185
1044	sub border {	1186	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1187	int $_[0]{border} * $::FONTSIZE
1046	}	1188	}
1047		1189
1048	sub size_request {	1190	sub size_request {
1049	my ($self) = @_;	1191	my ($self) = @_;
		1192
		1193	$self->{title_widget}->size_request
		1194	if $self->{title_widget};
		1195
		1196	$self->{close_button}->size_request
		1197	if $self->{close_button};
1050		1198
1051	my ($w, $h) = $self->SUPER::size_request;	1199	my ($w, $h) = $self->SUPER::size_request;
1052		1200
1053	(	1201	(
1054	$w + $self->border * 2,	1202	$w + $self->border * 2,
1055	$h + $self->border * 2,	1203	$h + $self->border * 2,
1056	)	1204	)
1057	}	1205	}
1058		1206
1059	sub size_allocate {	1207	sub invoke_size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1208	my ($self, $w, $h) = @_;
1061		1209
1062	return unless $changed;	1210	if ($self->{title_widget}) {
		1211	$self->{title_widget}{w} = $w;
		1212	$self->{title_widget}{h} = $h;
		1213	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1214	}
1063		1215
		1216	my $border = $self->border;
		1217
1064	$h -= List::Util::max 0, $self->border * 2;	1218	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1219	$w -= List::Util::max 0, $border * 2;
1066		1220
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1221	$self->child->configure ($border, $border, $w, $h);
1071	}
1072		1222
		1223	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1224	if $self->{close_button};
		1225
		1226	1
		1227	}
		1228
		1229	sub invoke_delete {
		1230	my ($self) = @_;
		1231
		1232	$self->hide;
		1233
		1234	1
		1235	}
		1236
1073	sub button_down {	1237	sub invoke_button_down {
1074	my ($self, $ev, $x, $y) = @_;	1238	my ($self, $ev, $x, $y) = @_;
1075		1239
1076	my ($w, $h) = @$self{qw(w h)};	1240	my ($w, $h) = @$self{qw(w h)};
1077	my $border = $self->border;	1241	my $border = $self->border;
1078		1242
…		…
1094	my $dy = $ev->{y} - $oy;	1258	my $dy = $ev->{y} - $oy;
1095		1259
1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1260	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1261	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098		1262
		1263	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099	$self->realloc;	1264	$self->realloc;
1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101	};	1265	};
1102		1266
1103	} elsif ($lr ^ $td) {	1267	} elsif ($lr ^ $td) {
1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1268	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105	my ($bx, $by) = ($self->{x}, $self->{y});	1269	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1108	my ($ev, $x, $y) = @_;	1272	my ($ev, $x, $y) = @_;
1109		1273
1110	($x, $y) = ($ev->{x}, $ev->{y});	1274	($x, $y) = ($ev->{x}, $ev->{y});
1111		1275
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1276	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1277	# HACK: the next line is required to enforce placement
		1278	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113	};	1279	};
		1280	} else {
		1281	return 0;
		1282	}
		1283
1114	}	1284	1
1115	}	1285	}
1116		1286
1117	sub button_up {	1287	sub invoke_button_up {
1118	my ($self, $ev, $x, $y) = @_;	1288	my ($self, $ev, $x, $y) = @_;
1119		1289
1120	delete $self->{motion};	1290	! ! delete $self->{motion}
1121	}	1291	}
1122		1292
1123	sub mouse_motion {	1293	sub invoke_mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1294	my ($self, $ev, $x, $y) = @_;
1125		1295
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1296	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1297
		1298	! ! $self->{motion}
		1299	}
		1300
		1301	sub invoke_visibility_change {
		1302	my ($self, $visible) = @_;
		1303
		1304	delete $self->{motion} unless $visible;
		1305
		1306	0
1127	}	1307	}
1128		1308
1129	sub _draw {	1309	sub _draw {
1130	my ($self) = @_;	1310	my ($self) = @_;
1131		1311
		1312	my $child = $self->{children}[0];
		1313
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1314	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1315	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1316
1135	glEnable GL_TEXTURE_2D;	1317	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1319
1138	my $border = $self->border;	1320	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1335	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1336	}
1155		1337
1156	glDisable GL_TEXTURE_2D;	1338	glDisable GL_TEXTURE_2D;
1157		1339
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1340	$child->draw;
		1341
		1342	if ($self->{title_widget}) {
		1343	glTranslate 0, $border - $self->{h};
		1344	$self->{title_widget}->_draw;
		1345
		1346	glTranslate 0, - ($border - $self->{h});
		1347	}
		1348
		1349	$self->{close_button}->draw
		1350	if $self->{close_button};
1161	}	1351	}
1162		1352
1163	#############################################################################	1353	#############################################################################
1164		1354
1165	package CFClient::UI::Table;	1355	package CFClient::UI::Table;
…		…
1182	sub children {	1372	sub children {
1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1184	}	1374	}
1185		1375
1186	sub add {	1376	sub add {
1187	my ($self, $x, $y, $child) = @_;	1377	my ($self) = shift;
1188		1378
		1379	while (@_) {
		1380	my ($x, $y, $child) = splice @_, 0, 3, ();
1189	$child->set_parent ($self);	1381	$child->set_parent ($self);
1190	$self->{children}[$y][$x] = $child;	1382	$self->{children}[$y][$x] = $child;
		1383	}
1191		1384
		1385	$self->{force_realloc} = 1;
		1386	$self->{force_size_alloc} = 1;
1192	$self->realloc;	1387	$self->realloc;
		1388	}
		1389
		1390	sub remove {
		1391	my ($self, $child) = @_;
		1392
		1393	# TODO: not yet implemented
1193	}	1394	}
1194		1395
1195	# TODO: move to container class maybe? send children a signal on removal?	1396	# TODO: move to container class maybe? send children a signal on removal?
1196	sub clear {	1397	sub clear {
1197	my ($self) = @_;	1398	my ($self) = @_;
…		…
1238	(sum @$ws),	1439	(sum @$ws),
1239	(sum @$hs),	1440	(sum @$hs),
1240	)	1441	)
1241	}	1442	}
1242		1443
1243	sub size_allocate {	1444	sub invoke_size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1445	my ($self, $w, $h) = @_;
1245		1446
1246	my ($ws, $hs) = $self->get_wh;	1447	my ($ws, $hs) = $self->get_wh;
1247		1448
1248	my $req_w = (sum @$ws) || 1;	1449	my $req_w = (sum @$ws) || 1;
1249	my $req_h = (sum @$hs) || 1;	1450	my $req_h = (sum @$hs) || 1;
…		…
1280	}	1481	}
1281		1482
1282	$y += $row_h;	1483	$y += $row_h;
1283	}	1484	}
1284		1485
		1486	1
1285	}	1487	}
1286		1488
1287	sub find_widget {	1489	sub find_widget {
1288	my ($self, $x, $y) = @_;	1490	my ($self, $x, $y) = @_;
1289		1491
…		…
1326	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1528	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1529	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1530	)
1329	}	1531	}
1330		1532
1331	sub size_allocate {	1533	sub invoke_size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1534	my ($self, $w, $h) = @_;
1333		1535
1334	my $space = $self->{vertical} ? $h : $w;	1536	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1537	my @children = $self->visible_children;
1336		1538
1337	my @req;	1539	my @req;
1338		1540
1339	if ($self->{homogeneous}) {	1541	if ($self->{homogeneous}) {
1340	@req = ($space / (@$children || 1)) x @$children;	1542	@req = ($space / (@children || 1)) x @children;
1341	} else {	1543	} else {
1342	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1544	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1343	my $req = List::Util::sum @req;	1545	my $req = List::Util::sum @req;
1344		1546
1345	if ($req > $space) {	1547	if ($req > $space) {
1346	# ah well, not enough space	1548	# ah well, not enough space
1347	$_ *= $space / $req for @req;	1549	$_ *= $space / $req for @req;
1348	} else {	1550	} else {
1349	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1551	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1350		1552
1351	$space = ($space - $req) / $expand; # remaining space to give away	1553	$space = ($space - $req) / $expand; # remaining space to give away
1352		1554
1353	$req[$_] += $space * $children->[$_]{expand}	1555	$req[$_] += $space * $children[$_]{expand}
1354	for 0 .. $#$children;	1556	for 0 .. $#children;
1355	}	1557	}
1356	}	1558	}
1357		1559
1358	CFClient::UI::harmonize \@req;	1560	CFClient::UI::harmonize \@req;
1359		1561
1360	my $pos = 0;	1562	my $pos = 0;
1361	for (0 .. $#$children) {	1563	for (0 .. $#children) {
1362	my $alloc = $req[$_];	1564	my $alloc = $req[$_];
1363	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364		1566
1365	$pos += $alloc;	1567	$pos += $alloc;
1366	}	1568	}
1367		1569
1368	1	1570	1
…		…
1420	ellipsise => 3, # end	1622	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1623	layout => (new CFClient::Layout),
1422	fontsize => 1,	1624	fontsize => 1,
1423	align => -1,	1625	align => -1,
1424	valign => -1,	1626	valign => -1,
1425	padding => 2,	1627	padding_x => 2,
		1628	padding_y => 2,
1426	can_events => 0,	1629	can_events => 0,
1427	%arg	1630	%arg
1428	);	1631	);
1429		1632
1430	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
…		…
1440	}	1643	}
1441		1644
1442	$self	1645	$self
1443	}	1646	}
1444		1647
1445	sub escape($) {
1446	local $_ = $_[0];
1447
1448	s/&/&amp;/g;
1449	s/>/&gt;/g;
1450	s/</&lt;/g;
1451
1452	$_
1453	}
1454
1455	sub update {	1648	sub update {
1456	my ($self) = @_;	1649	my ($self) = @_;
1457		1650
1458	delete $self->{texture};	1651	delete $self->{texture};
1459	$self->SUPER::update;	1652	$self->SUPER::update;
1460	}	1653	}
1461		1654
		1655	sub realloc {
		1656	my ($self) = @_;
		1657
		1658	delete $self->{ox};
		1659	$self->SUPER::realloc;
		1660	}
		1661
1462	sub set_text {	1662	sub set_text {
1463	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1464		1664
1465	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1466	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1467		1667
1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1470		1669
		1670	delete $self->{size_req};
1471	$self->realloc;	1671	$self->realloc;
1472	$self->update;	1672	$self->update;
1473	}	1673	}
1474		1674
1475	sub set_markup {	1675	sub set_markup {
…		…
1478	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1479	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1480		1680
1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482		1682
1483	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1485		1684
		1685	delete $self->{size_req};
1486	$self->realloc;	1686	$self->realloc;
1487	$self->update;	1687	$self->update;
1488	}	1688	}
1489		1689
1490	sub size_request {	1690	sub size_request {
1491	my ($self) = @_;	1691	my ($self) = @_;
1492		1692
		1693	$self->{size_req} ||= do {
1493	$self->{layout}->set_font ($self->{font}) if $self->{font};	1694	$self->{layout}->set_font ($self->{font}) if $self->{font};
1494	$self->{layout}->set_width ($self->{max_w} || -1);	1695	$self->{layout}->set_width ($self->{max_w} || -1);
1495	$self->{layout}->set_ellipsise ($self->{ellipsise});	1696	$self->{layout}->set_ellipsise ($self->{ellipsise});
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1697	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1698	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1699
1499	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1500		1701
1501	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1502	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1503	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504		1706
1505	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1506		1708
1507	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1710	$h = List::Util::max $h, $h2;
		1711	}
		1712
		1713	[$w, $h]
1509	}	1714	};
1510		1715
1511	(	1716	@{ $self->{size_req} }
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1717	}
1516		1718
		1719	sub baseline_shift {
		1720	$_[0]{layout}->descent
		1721	}
		1722
1517	sub size_allocate {	1723	sub invoke_size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1724	my ($self, $w, $h) = @_;
		1725
		1726	delete $self->{ox};
1519		1727
1520	delete $self->{texture}	1728	delete $self->{texture}
1521	if $changed;	1729	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1730
		1731	1
1522	}	1732	}
1523		1733
1524	sub set_fontsize {	1734	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1735	my ($self, $fontsize) = @_;
1526		1736
1527	$self->{fontsize} = $fontsize;	1737	$self->{fontsize} = $fontsize;
		1738	delete $self->{size_req};
1528	delete $self->{texture};	1739	delete $self->{texture};
1529		1740
1530	$self->realloc;	1741	$self->realloc;
1531	}	1742	}
1532		1743
		1744	sub reconfigure {
		1745	my ($self) = @_;
		1746
		1747	delete $self->{size_req};
		1748	delete $self->{texture};
		1749
		1750	$self->SUPER::reconfigure;
		1751	}
		1752
1533	sub _draw {	1753	sub _draw {
1534	my ($self) = @_;	1754	my ($self) = @_;
1535		1755
1536	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1537		1757
1538	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1539	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1540	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1541	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1765
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1766	[$self->{layout}->size]
1547
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550	: ($self->{w} - $tex->{w}) * 0.5);
1551
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1767	};
1558		1768
1559	glEnable GL_TEXTURE_2D;	1769	unless (exists $self->{ox}) {
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		1772	: ($self->{w} - $size->[0]) * 0.5);
1561		1773
1562	if ($tex->{format} == GL_ALPHA) {	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563	glColor @{$self->{fg}};	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1776	: ($self->{h} - $size->[1]) * 0.5);
1565	} else {
1566	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567	}	1777	};
1568		1778
1569	glDisable GL_TEXTURE_2D;	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
		1781
		1782	$self->{layout}->render ($self->{ox}, $self->{oy});
1570	}	1783	}
1571		1784
1572	#############################################################################	1785	#############################################################################
1573		1786
1574	package CFClient::UI::EntryBase;	1787	package CFClient::UI::EntryBase;
…		…
1588	can_hover => 1,	1801	can_hover => 1,
1589	can_focus => 1,	1802	can_focus => 1,
1590	valign => 0,	1803	valign => 0,
1591	can_events => 1,	1804	can_events => 1,
1592	#text => ...	1805	#text => ...
		1806	#hidden => "*",
1593	@_	1807	@_
1594	)	1808	)
1595	}	1809	}
1596		1810
1597	sub _set_text {	1811	sub _set_text {
…		…
1599		1813
1600	delete $self->{cur_h};	1814	delete $self->{cur_h};
1601		1815
1602	return if $self->{text} eq $text;	1816	return if $self->{text} eq $text;
1603		1817
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1818	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1819	$self->{text} = $text;
1608		1820
1609	$text =~ s/./*/g if $self->{hidden};	1821	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1822	$self->{layout}->set_text ("$text ");
		1823	delete $self->{size_req};
1611		1824
1612	$self->_emit (changed => $self->{text});	1825	$self->emit (changed => $self->{text});
		1826
		1827	$self->realloc;
		1828	$self->update;
1613	}	1829	}
1614		1830
1615	sub set_text {	1831	sub set_text {
1616	my ($self, $text) = @_;	1832	my ($self, $text) = @_;
1617		1833
1618	$self->{cursor} = length $text;	1834	$self->{cursor} = length $text;
1619	$self->_set_text ($text);	1835	$self->_set_text ($text);
1620
1621	$self->realloc;
1622	}	1836	}
1623		1837
1624	sub get_text {	1838	sub get_text {
1625	$_[0]{text}	1839	$_[0]{text}
1626	}	1840	}
…		…
1631	my ($w, $h) = $self->SUPER::size_request;	1845	my ($w, $h) = $self->SUPER::size_request;
1632		1846
1633	($w + 1, $h) # add 1 for cursor	1847	($w + 1, $h) # add 1 for cursor
1634	}	1848	}
1635		1849
1636	sub key_down {	1850	sub invoke_key_down {
1637	my ($self, $ev) = @_;	1851	my ($self, $ev) = @_;
1638		1852
1639	my $mod = $ev->{mod};	1853	my $mod = $ev->{mod};
1640	my $sym = $ev->{sym};	1854	my $sym = $ev->{sym};
1641	my $uni = $ev->{unicode};	1855	my $uni = $ev->{unicode};
…		…
1653	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFClient::SDLK_HOME) {
1654	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1655	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFClient::SDLK_END) {
1656	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1872	$self->emit ('escape');
1659	} elsif ($uni) {	1873	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
		1875	} else {
		1876	return 0;
1661	}	1877	}
1662		1878
1663	$self->_set_text ($text);	1879	$self->_set_text ($text);
1664		1880
1665	$self->realloc;	1881	$self->realloc;
1666	}
1667		1882
		1883	1
		1884	}
		1885
1668	sub focus_in {	1886	sub invoke_focus_in {
1669	my ($self) = @_;	1887	my ($self) = @_;
1670		1888
1671	$self->{last_activity} = $::NOW;	1889	$self->{last_activity} = $::NOW;
1672		1890
1673	$self->SUPER::focus_in;	1891	$self->SUPER::invoke_focus_in
1674	}	1892	}
1675		1893
1676	sub button_down {	1894	sub invoke_button_down {
1677	my ($self, $ev, $x, $y) = @_;	1895	my ($self, $ev, $x, $y) = @_;
1678		1896
1679	$self->SUPER::button_down ($ev, $x, $y);	1897	$self->SUPER::invoke_button_down ($ev, $x, $y);
1680		1898
1681	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1682		1900
1683	# byte-index to char-index	1901	# byte-index to char-index
1684	my $text = $self->{text};	1902	my $text = $self->{text};
1685	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1687		1905
1688	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1689	$self->update;	1907	$self->update;
		1908
		1909	1
1690	}	1910	}
1691		1911
1692	sub mouse_motion {	1912	sub invoke_mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1913	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1914	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1915
		1916	1
1695	}	1917	}
1696		1918
1697	sub _draw {	1919	sub _draw {
1698	my ($self) = @_;	1920	my ($self) = @_;
1699		1921
1700	local $self->{fg} = $self->{fg};	1922	local $self->{fg} = $self->{fg};
1701		1923
1702	if ($FOCUS == $self) {	1924	if ($FOCUS == $self) {
1703	glColor @{$self->{active_bg}};	1925	glColor_premultiply @{$self->{active_bg}};
1704	$self->{fg} = $self->{active_fg};	1926	$self->{fg} = $self->{active_fg};
1705	} else {	1927	} else {
1706	glColor @{$self->{bg}};	1928	glColor_premultiply @{$self->{bg}};
1707	}	1929	}
1708		1930
1709	glEnable GL_BLEND;	1931	glEnable GL_BLEND;
1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1932	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711	glBegin GL_QUADS;	1933	glBegin GL_QUADS;
1712	glVertex 0 , 0;	1934	glVertex 0 , 0;
1713	glVertex 0 , $self->{h};	1935	glVertex 0 , $self->{h};
1714	glVertex $self->{w}, $self->{h};	1936	glVertex $self->{w}, $self->{h};
1715	glVertex $self->{w}, 0;	1937	glVertex $self->{w}, 0;
…		…
1740		1962
1741	our @ISA = CFClient::UI::EntryBase::;	1963	our @ISA = CFClient::UI::EntryBase::;
1742		1964
1743	use CFClient::OpenGL;	1965	use CFClient::OpenGL;
1744		1966
1745	sub key_down {	1967	sub invoke_key_down {
1746	my ($self, $ev) = @_;	1968	my ($self, $ev) = @_;
1747		1969
1748	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1749		1971
1750	if ($sym == 13) {	1972	if ($sym == 13) {
1751	unshift @{$self->{history}},	1973	unshift @{$self->{history}},
1752	my $txt = $self->get_text;	1974	my $txt = $self->get_text;
		1975
1753	$self->{history_pointer} = -1;	1976	$self->{history_pointer} = -1;
1754	$self->{history_saveback} = '';	1977	$self->{history_saveback} = '';
1755	$self->_emit (activate => $txt);	1978	$self->emit (activate => $txt);
1756	$self->update;	1979	$self->update;
1757		1980
1758	} elsif ($sym == CFClient::SDLK_UP) {	1981	} elsif ($sym == CFClient::SDLK_UP) {
1759	if ($self->{history_pointer} < 0) {	1982	if ($self->{history_pointer} < 0) {
1760	$self->{history_saveback} = $self->get_text;	1983	$self->{history_saveback} = $self->get_text;
…		…
1776	} else {	1999	} else {
1777	$self->set_text ($self->{history_saveback});	2000	$self->set_text ($self->{history_saveback});
1778	}	2001	}
1779		2002
1780	} else {	2003	} else {
1781	$self->SUPER::key_down ($ev);	2004	return $self->SUPER::invoke_key_down ($ev)
		2005	}
		2006
1782	}	2007	1
1783
1784	}	2008	}
1785		2009
1786	#############################################################################	2010	#############################################################################
1787		2011
1788	package CFClient::UI::Button;	2012	package CFClient::UI::Button;
…		…
1797		2021
1798	sub new {	2022	sub new {
1799	my $class = shift;	2023	my $class = shift;
1800		2024
1801	$class->SUPER::new (	2025	$class->SUPER::new (
1802	padding => 4,	2026	padding_x => 4,
		2027	padding_y => 4,
1803	fg => [1, 1, 1],	2028	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	2029	active_fg => [0, 0, 1],
1805	can_hover => 1,	2030	can_hover => 1,
1806	align => 0,	2031	align => 0,
1807	valign => 0,	2032	valign => 0,
1808	can_events => 1,	2033	can_events => 1,
1809	@_	2034	@_
1810	)	2035	)
1811	}	2036	}
1812		2037
1813	sub activate { }
1814
1815	sub button_up {	2038	sub invoke_button_up {
1816	my ($self, $ev, $x, $y) = @_;	2039	my ($self, $ev, $x, $y) = @_;
1817		2040
1818	$self->emit ("activate")	2041	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	2042	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	2043	&& $y >= 0 && $y < $self->{h};
		2044
		2045	1
1821	}	2046	}
1822		2047
1823	sub _draw {	2048	sub _draw {
1824	my ($self) = @_;	2049	my ($self) = @_;
1825		2050
1826	local $self->{fg} = $self->{fg};	2051	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828	if ($GRAB == $self) {
1829	$self->{fg} = $self->{active_fg};
1830	}
1831		2052
1832	glEnable GL_TEXTURE_2D;	2053	glEnable GL_TEXTURE_2D;
1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834	glColor 0, 0, 0, 1;	2055	glColor 0, 0, 0, 1;
1835		2056
…		…
1854		2075
1855	sub new {	2076	sub new {
1856	my $class = shift;	2077	my $class = shift;
1857		2078
1858	$class->SUPER::new (	2079	$class->SUPER::new (
1859	padding => 2,	2080	padding_x => 2,
		2081	padding_y => 2,
1860	fg => [1, 1, 1],	2082	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	2083	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	2084	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	2085	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	2086	state => 0,
…		…
1868	}	2090	}
1869		2091
1870	sub size_request {	2092	sub size_request {
1871	my ($self) = @_;	2093	my ($self) = @_;
1872		2094
1873	($self->{padding} * 2 + 6) x 2	2095	(6) x 2
1874	}	2096	}
1875		2097
		2098	sub toggle {
		2099	my ($self) = @_;
		2100
		2101	$self->{state} = !$self->{state};
		2102	$self->emit (changed => $self->{state});
		2103	$self->update;
		2104	}
		2105
1876	sub button_down {	2106	sub invoke_button_down {
1877	my ($self, $ev, $x, $y) = @_;	2107	my ($self, $ev, $x, $y) = @_;
1878		2108
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2109	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2110	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	2111	$self->toggle;
1882	$self->_emit (changed => $self->{state});	2112	} else {
		2113	return 0
		2114	}
		2115
1883	}	2116	1
1884	}	2117	}
1885		2118
1886	sub _draw {	2119	sub _draw {
1887	my ($self) = @_;	2120	my ($self) = @_;
1888		2121
1889	$self->SUPER::_draw;	2122	$self->SUPER::_draw;
1890		2123
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2124	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		2125
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2126	my ($w, $h) = @$self{qw(w h)};
		2127
		2128	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		2129
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2130	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		2131
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	2132	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		2133
…		…
1906	package CFClient::UI::Image;	2141	package CFClient::UI::Image;
1907		2142
1908	our @ISA = CFClient::UI::Base::;	2143	our @ISA = CFClient::UI::Base::;
1909		2144
1910	use CFClient::OpenGL;	2145	use CFClient::OpenGL;
1911	use Carp qw/confess/;
1912		2146
1913	our %loaded_images;	2147	our %texture_cache;
1914		2148
1915	sub new {	2149	sub new {
1916	my $class = shift;	2150	my $class = shift;
1917		2151
1918	my $self = $class->SUPER::new (can_events => 0, @_);	2152	my $self = $class->SUPER::new (
		2153	can_events => 0,
		2154	@_,
		2155	);
1919		2156
1920	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2157	$self->{path} || $self->{tex}
		2158	or Carp::croak "'path' or 'tex' attributes required";
1921		2159
1922	$loaded_images{$self->{image}} ||=	2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1923	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924		2162
1925	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2163	Scalar::Util::weaken $texture_cache{$self->{path}};
1926		2164
1927	Scalar::Util::weaken $loaded_images{$self->{image}};	2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929	$self->{aspect} = $tex->{w} / $tex->{h};
1930		2166
1931	$self	2167	$self
1932	}	2168	}
1933		2169
		2170	sub STORABLE_freeze {
		2171	my ($self, $cloning) = @_;
		2172
		2173	$self->{path}
		2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
		2175
		2176	$self->{path}
		2177	}
		2178
		2179	sub STORABLE_attach {
		2180	my ($self, $cloning, $path) = @_;
		2181
		2182	$self->new (path => $path)
		2183	}
		2184
1934	sub size_request {	2185	sub size_request {
1935	my ($self) = @_;	2186	my ($self) = @_;
1936		2187
1937	($self->{tex}->{w}, $self->{tex}->{h})	2188	($self->{tex}{w}, $self->{tex}{h})
1938	}	2189	}
1939		2190
1940	sub _draw {	2191	sub _draw {
1941	my ($self) = @_;	2192	my ($self) = @_;
1942		2193
…		…
1952	}	2203	}
1953		2204
1954	glEnable GL_TEXTURE_2D;	2205	glEnable GL_TEXTURE_2D;
1955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1956		2207
1957	$tex->draw_quad_alpha (0, 0, $w, $h);	2208	$tex->draw_quad (0, 0, $w, $h);
1958		2209
1959	glDisable GL_TEXTURE_2D;	2210	glDisable GL_TEXTURE_2D;
		2211	}
		2212
		2213	#############################################################################
		2214
		2215	package CFClient::UI::ImageButton;
		2216
		2217	our @ISA = CFClient::UI::Image::;
		2218
		2219	use CFClient::OpenGL;
		2220
		2221	my %textures;
		2222
		2223	sub new {
		2224	my $class = shift;
		2225
		2226	my $self = $class->SUPER::new (
		2227	padding_x => 4,
		2228	padding_y => 4,
		2229	fg => [1, 1, 1],
		2230	active_fg => [0, 0, 1],
		2231	can_hover => 1,
		2232	align => 0,
		2233	valign => 0,
		2234	can_events => 1,
		2235	@_
		2236	);
		2237	}
		2238
		2239	sub invoke_button_up {
		2240	my ($self, $ev, $x, $y) = @_;
		2241
		2242	$self->emit ("activate")
		2243	if $x >= 0 && $x < $self->{w}
		2244	&& $y >= 0 && $y < $self->{h};
		2245
		2246	1
1960	}	2247	}
1961		2248
1962	#############################################################################	2249	#############################################################################
1963		2250
1964	package CFClient::UI::VGauge;	2251	package CFClient::UI::VGauge;
…		…
2051	my $ycut1 = max 0, min 1, $ycut;	2338	my $ycut1 = max 0, min 1, $ycut;
2052	my $ycut2 = max 0, min 1, $ycut - 1;	2339	my $ycut2 = max 0, min 1, $ycut - 1;
2053		2340
2054	my $h1 = $self->{h} * (1 - $ycut1);	2341	my $h1 = $self->{h} * (1 - $ycut1);
2055	my $h2 = $self->{h} * (1 - $ycut2);	2342	my $h2 = $self->{h} * (1 - $ycut2);
		2343	my $h3 = $self->{h};
		2344
		2345	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056		2346
2057	glEnable GL_BLEND;	2347	glEnable GL_BLEND;
2058	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2348	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2349	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059	glEnable GL_TEXTURE_2D;	2350	glEnable GL_TEXTURE_2D;
2060	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2351	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061		2352
2062	glBindTexture GL_TEXTURE_2D, $t1->{name};	2353	glBindTexture GL_TEXTURE_2D, $t1->{name};
2063	glBegin GL_QUADS;	2354	glBegin GL_QUADS;
…		…
2078		2369
2079	if ($t3) {	2370	if ($t3) {
2080	glBindTexture GL_TEXTURE_2D, $t3->{name};	2371	glBindTexture GL_TEXTURE_2D, $t3->{name};
2081	glBegin GL_QUADS;	2372	glBegin GL_QUADS;
2082	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2373	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2374	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2375	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2376	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086	glEnd;	2377	glEnd;
2087	}	2378	}
2088		2379
2089	glDisable GL_BLEND;	2380	glDisable GL_BLEND;
…		…
2177	$self->update;	2468	$self->update;
2178		2469
2179	$self	2470	$self
2180	}	2471	}
2181		2472
2182	sub changed { }
2183
2184	sub set_range {	2473	sub set_range {
2185	my ($self, $range) = @_;	2474	my ($self, $range) = @_;
2186		2475
2187	($range, $self->{range}) = ($self->{range}, $range);	2476	($range, $self->{range}) = ($self->{range}, $range);
2188		2477
2189	$self->update
2190	if "@$range" ne "@{$self->{range}}";	2478	if ("@$range" ne "@{$self->{range}}") {
		2479	$self->update;
		2480	$self->set_value ($self->{range}[0]);
		2481	}
2191	}	2482	}
2192		2483
2193	sub set_value {	2484	sub set_value {
2194	my ($self, $value) = @_;	2485	my ($self, $value) = @_;
2195		2486
…		…
2206	if $unit;	2497	if $unit;
2207		2498
2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2499	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209		2500
2210	if ($value != $old_value) {	2501	if ($value != $old_value) {
2211	$self->_emit (changed => $value);	2502	$self->emit (changed => $value);
2212	$self->update;	2503	$self->update;
2213	}	2504	}
2214	}	2505	}
2215		2506
2216	sub size_request {	2507	sub size_request {
2217	my ($self) = @_;	2508	my ($self) = @_;
2218		2509
2219	($self->{req_w}, $self->{req_h})	2510	($self->{req_w}, $self->{req_h})
2220	}	2511	}
2221		2512
2222	sub button_down {	2513	sub invoke_button_down {
2223	my ($self, $ev, $x, $y) = @_;	2514	my ($self, $ev, $x, $y) = @_;
2224		2515
2225	$self->SUPER::button_down ($ev, $x, $y);	2516	$self->SUPER::invoke_button_down ($ev, $x, $y);
2226		2517
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2518	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2519
2229	$self->mouse_motion ($ev, $x, $y);	2520	$self->invoke_mouse_motion ($ev, $x, $y)
2230	}	2521	}
2231		2522
2232	sub mouse_motion {	2523	sub invoke_mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2524	my ($self, $ev, $x, $y) = @_;
2234		2525
2235	if ($GRAB == $self) {	2526	if ($GRAB == $self) {
2236	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2527	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2237		2528
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2529	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2530
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2531	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2532
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2533	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2534	} else {
		2535	return 0;
		2536	}
		2537
2243	}	2538	1
		2539	}
		2540
		2541	sub invoke_mouse_wheel {
		2542	my ($self, $ev) = @_;
		2543
		2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2545
		2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2547
		2548	! ! $delta
2244	}	2549	}
2245		2550
2246	sub update {	2551	sub update {
2247	my ($self) = @_;	2552	my ($self) = @_;
2248		2553
2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2554	delete $self->{knob_w};
		2555	$self->SUPER::update;
		2556	}
		2557
		2558	sub _draw {
		2559	my ($self) = @_;
		2560
		2561	unless ($self->{knob_w}) {
2250	$self->set_value ($self->{range}[0]);	2562	$self->set_value ($self->{range}[0]);
2251		2563
2252	my ($value, $lo, $hi, $page) = @{$self->{range}};	2564	my ($value, $lo, $hi, $page) = @{$self->{range}};
2253	my $range = ($hi - $page - $lo) || 1e-100;	2565	my $range = ($hi - $page - $lo) || 1e-100;
2254		2566
…		…
2260	$value = ($value - $lo) / $range;	2572	$value = ($value - $lo) / $range;
2261	$value = $value * $self->{scale} + $self->{offset};	2573	$value = $value * $self->{scale} + $self->{offset};
2262		2574
2263	$self->{knob_x} = $value - $knob_w * 0.5;	2575	$self->{knob_x} = $value - $knob_w * 0.5;
2264	$self->{knob_w} = $knob_w;	2576	$self->{knob_w} = $knob_w;
2265	});	2577	}
2266
2267	$self->SUPER::update;
2268	}
2269
2270	sub _draw {
2271	my ($self) = @_;
2272		2578
2273	$self->SUPER::_draw ();	2579	$self->SUPER::_draw ();
2274		2580
2275	glScale $self->{w}, $self->{h};	2581	glScale $self->{w}, $self->{h};
2276		2582
…		…
2337	sub set_range { shift->{slider}->set_range (@_) }	2643	sub set_range { shift->{slider}->set_range (@_) }
2338	sub set_value { shift->{slider}->set_value (@_) }	2644	sub set_value { shift->{slider}->set_value (@_) }
2339		2645
2340	#############################################################################	2646	#############################################################################
2341		2647
2342	package CFClient::UI::TextView;	2648	package CFClient::UI::TextScroller;
2343		2649
2344	our @ISA = CFClient::UI::HBox::;	2650	our @ISA = CFClient::UI::HBox::;
2345		2651
2346	use CFClient::OpenGL;	2652	use CFClient::OpenGL;
2347		2653
2348	sub new {	2654	sub new {
2349	my $class = shift;	2655	my $class = shift;
2350		2656
2351	my $self = $class->SUPER::new (	2657	my $self = $class->SUPER::new (
2352	fontsize => 1,	2658	fontsize => 1,
2353	can_events => 0,	2659	can_events => 1,
		2660	indent => 0,
2354	#font => default_font	2661	#font => default_font
2355	@_,	2662	@_,
2356		2663
2357	layout => (new CFClient::Layout 1),	2664	layout => (new CFClient::Layout),
2358	par => [],	2665	par => [],
2359	height => 0,	2666	height => 0,
2360	children => [	2667	children => [
2361	(new CFClient::UI::Empty expand => 1),	2668	(new CFClient::UI::Empty expand => 1),
2362	(new CFClient::UI::Slider vertical => 1),	2669	(new CFClient::UI::Slider vertical => 1),
…		…
2373		2680
2374	$self->{fontsize} = $fontsize;	2681	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2682	$self->reflow;
2376	}	2683	}
2377		2684
		2685	sub size_request {
		2686	my ($self) = @_;
		2687
		2688	my ($empty, $slider) = @{ $self->{children} };
		2689
		2690	local $self->{children} = [$empty, $slider];
		2691	$self->SUPER::size_request
		2692	}
		2693
2378	sub size_allocate {	2694	sub invoke_size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2695	my ($self, $w, $h) = @_;
2380		2696
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2697	my ($empty, $slider, @other) = @{ $self->{children} };
2382		2698	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2383	return unless $changed;
2384		2699
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2700	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2701	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2702	$self->{layout}->set_width ($empty->{w});
		2703	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388		2704
2389	$self->reflow;	2705	$self->reflow;
2390	}
2391		2706
2392	sub text_size {	2707	local $self->{children} = [$empty, $slider];
		2708	$self->SUPER::invoke_size_allocate ($w, $h)
		2709	}
		2710
		2711	sub invoke_mouse_wheel {
2393	my ($self, $text, $indent) = @_;	2712	my ($self, $ev) = @_;
		2713
		2714	return 0 unless $ev->{dy}; # only vertical movements
		2715
		2716	$self->{children}[1]->emit (mouse_wheel => $ev);
		2717
		2718	1
		2719	}
		2720
		2721	sub get_layout {
		2722	my ($self, $para) = @_;
2394		2723
2395	my $layout = $self->{layout};	2724	my $layout = $self->{layout};
2396		2725
		2726	$layout->set_font ($self->{font}) if $self->{font};
		2727	$layout->set_foreground (@{$para->{fg}});
2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2728	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398	$layout->set_width ($self->{children}[0]{w} - $indent);	2729	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2730	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399	$layout->set_markup ($text);	2731	$layout->set_markup ($para->{markup});
		2732
		2733	$layout->set_shapes (
		2734	map
		2735	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2736	@{$para->{widget}}
2400		2737	);
		2738
2401	$layout->size	2739	$layout
2402	}	2740	}
2403		2741
2404	sub reflow {	2742	sub reflow {
2405	my ($self) = @_;	2743	my ($self) = @_;
2406		2744
…		…
2415	$self->{children}[1]->set_value ($offset);	2753	$self->{children}[1]->set_value ($offset);
2416	}	2754	}
2417		2755
2418	sub clear {	2756	sub clear {
2419	my ($self) = @_;	2757	my ($self) = @_;
		2758
		2759	my (undef, undef, @other) = @{ $self->{children} };
		2760	$self->remove ($_) for @other;
2420		2761
2421	$self->{par} = [];	2762	$self->{par} = [];
2422	$self->{height} = 0;	2763	$self->{height} = 0;
2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2764	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424	}	2765	}
2425		2766
2426	sub add_paragraph {	2767	sub add_paragraph {
2427	my ($self, $color, $text, $indent) = @_;	2768	my $self = shift;
2428		2769
2429	for my $line (split /\n/, $text) {	2770	for my $para (@_) {
2430	my ($w, $h) = $self->text_size ($line);	2771	$para = {
2431	$self->{height} += $h;	2772	fg => [1, 1, 1, 1],
2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2773	indent => 0,
2433	}	2774	markup => "",
		2775	widget => [],
		2776	ref $para ? %$para : (markup => $para),
		2777	w => 1e10,
		2778	wrapped => 1,
		2779	};
2434		2780
2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2782	push @{$self->{par}}, $para;
		2783	}
		2784
		2785	$self->{need_reflow}++;
		2786	$self->update;
		2787	}
		2788
		2789	sub scroll_to_bottom {
		2790	my ($self) = @_;
		2791
		2792	$self->{scroll_to_bottom} = 1;
		2793	$self->update;
2436	}	2794	}
2437		2795
2438	sub update {	2796	sub update {
2439	my ($self) = @_;	2797	my ($self) = @_;
2440		2798
…		…
2442		2800
2443	return unless $self->{h} > 0;	2801	return unless $self->{h} > 0;
2444		2802
2445	delete $self->{texture};	2803	delete $self->{texture};
2446		2804
2447	$ROOT->on_post_alloc ($self, sub {	2805	$ROOT->on_post_alloc ($self => sub {
2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449		2807
2450	if (delete $self->{need_reflow}) {	2808	if (delete $self->{need_reflow}) {
2451	my $height = 0;	2809	my $height = 0;
2452		2810
2453	my $layout = $self->{layout};
2454
2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457	for (@{$self->{par}}) {	2811	for my $para (@{$self->{par}}) {
2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2459	$layout->set_width ($W - $_->[3]);	2813	my $layout = $self->get_layout ($para);
2460	$layout->set_markup ($_->[4]);
2461	my ($w, $h) = $layout->size;	2814	my ($w, $h) = $layout->size;
2462	$_->[0] = $w + $_->[3];	2815
2463	$_->[1] = $h;	2816	$para->{w} = $w + $para->{indent};
		2817	$para->{h} = $h;
		2818	$para->{wrapped} = $layout->has_wrapped;
2464	}	2819	}
2465		2820
2466	$height += $_->[1];	2821	$height += $para->{h};
2467	}	2822	}
2468		2823
2469	$self->{height} = $height;	2824	$self->{height} = $height;
2470		2825
2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2472		2827
2473	delete $self->{texture};	2828	delete $self->{texture};
2474	}	2829	}
2475		2830
		2831	if (delete $self->{scroll_to_bottom}) {
		2832	$self->{children}[1]->set_value (1e10);
		2833	}
		2834
2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2835	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477	glClearColor 0.5, 0.5, 0.5, 0;	2836	glClearColor 0, 0, 0, 0;
2478	glClear GL_COLOR_BUFFER_BIT;	2837	glClear GL_COLOR_BUFFER_BIT;
2479		2838
2480	my $top = int $self->{children}[1]{range}[0];	2839	my $top = int $self->{children}[1]{range}[0];
2481		2840
2482	my $y0 = $top;	2841	my $y0 = $top;
2483	my $y1 = $top + $H;	2842	my $y1 = $top + $H;
2484		2843
2485	my $y = 0;	2844	my $y = 0;
2486		2845
2487	my $layout = $self->{layout};
2488
2489	$layout->set_font ($self->{font}) if $self->{font};
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
2495	for my $par (@{$self->{par}}) {	2846	for my $para (@{$self->{par}}) {
2496	my $h = $par->[1];	2847	my $h = $para->{h};
2497		2848
2498	if ($y0 < $y + $h && $y < $y1) {	2849	if ($y0 < $y + $h && $y < $y1) {
2499	$layout->set_foreground (@{ $par->[2] });
2500	$layout->set_width ($W - $par->[3]);
2501	$layout->set_markup ($par->[4]);
2502		2850
2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2851	my $layout = $self->get_layout ($para);
2504		2852
2505	glRasterPos $par->[3], $y - $y0;	2853	$layout->render ($para->{indent}, $y - $y0);
2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2854
		2855	if (my @w = @{ $para->{widget} }) {
		2856	my @s = $layout->get_shapes;
		2857
		2858	for (@w) {
		2859	my ($dx, $dy) = splice @s, 0, 2, ();
		2860
		2861	$_->{x} = $dx + $para->{indent};
		2862	$_->{y} = $dy + $y - $y0;
		2863
		2864	$_->draw;
		2865	}
		2866	}
2507	}	2867	}
2508		2868
2509	$y += $h;	2869	$y += $h;
2510	}	2870	}
2511
2512	glDisable GL_BLEND;
2513	};	2871	};
2514	});	2872	});
2515	}	2873	}
2516		2874
		2875	sub reconfigure {
		2876	my ($self) = @_;
		2877
		2878	$self->SUPER::reconfigure;
		2879
		2880	$_->{w} = 1e10 for @{ $self->{par} };
		2881	$self->reflow;
		2882	}
		2883
2517	sub _draw {	2884	sub _draw {
2518	my ($self) = @_;	2885	my ($self) = @_;
2519		2886
2520	glEnable GL_TEXTURE_2D;	2887	glEnable GL_TEXTURE_2D;
2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2888	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522	glColor 1, 1, 1, 1;	2889	glColor 0, 0, 0, 1;
2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2890	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524	glDisable GL_TEXTURE_2D;	2891	glDisable GL_TEXTURE_2D;
2525		2892
2526	$self->{children}[1]->draw;	2893	$self->{children}[1]->draw;
2527
2528	}	2894	}
2529		2895
2530	#############################################################################	2896	#############################################################################
2531		2897
2532	package CFClient::UI::Animator;	2898	package CFClient::UI::Animator;
…		…
2611	}	2977	}
2612		2978
2613	sub set_tooltip_from {	2979	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2980	my ($self, $widget) = @_;
2615		2981
		2982	my $tooltip = $widget->{tooltip};
		2983
		2984	if ($ENV{CFPLUS_DEBUG} & 2) {
		2985	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2986	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2987	. "req $widget->{req_w} $widget->{req_h}\n"
		2988	. "visible $widget->{visible}";
		2989	}
		2990
		2991	$tooltip =~ s/^\n+//;
		2992	$tooltip =~ s/\n+$//;
		2993
2616	$self->add (new CFClient::UI::Label	2994	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2995	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2997	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2998	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2999	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	3000	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2629	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3007	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630		3008
2631	($w + 4, $h + 4)	3009	($w + 4, $h + 4)
2632	}	3010	}
2633		3011
2634	sub size_allocate {	3012	sub invoke_size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	3013	my ($self, $w, $h) = @_;
2636		3014
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3015	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2640	}	3016	}
2641		3017
2642	sub visibility_change {	3018	sub invoke_visibility_change {
2643	my ($self, $visible) = @_;	3019	my ($self, $visible) = @_;
2644		3020
2645	return unless $visible;	3021	return unless $visible;
2646		3022
2647	$self->{root}->on_post_alloc ("move_$self" => sub {	3023	$self->{root}->on_post_alloc ("move_$self" => sub {
2648	my $widget = $self->{owner}	3024	my $widget = $self->{owner}
2649	or return;	3025	or return;
2650		3026
		3027	if ($widget->{visible}) {
2651	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3028	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652		3029
2653	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3030	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654	if $x + $self->{w} > $::WIDTH;	3031	if $x + $self->{w} > $self->{root}{w};
2655		3032
2656	$self->move_abs ($x, $y);	3033	$self->move_abs ($x, $y);
		3034	} else {
		3035	$self->hide;
		3036	}
2657	});	3037	});
2658	}	3038	}
2659		3039
2660	sub _draw {	3040	sub _draw {
2661	my ($self) = @_;	3041	my ($self) = @_;
…		…
2687		3067
2688	#############################################################################	3068	#############################################################################
2689		3069
2690	package CFClient::UI::Face;	3070	package CFClient::UI::Face;
2691		3071
2692	our @ISA = CFClient::UI::Base::;	3072	our @ISA = CFClient::UI::DrawBG::;
2693		3073
2694	use CFClient::OpenGL;	3074	use CFClient::OpenGL;
2695		3075
2696	sub new {	3076	sub new {
2697	my $class = shift;	3077	my $class = shift;
…		…
2734	sub _draw {	3114	sub _draw {
2735	my ($self) = @_;	3115	my ($self) = @_;
2736		3116
2737	return unless $::CONN;	3117	return unless $::CONN;
2738		3118
		3119	$self->SUPER::_draw;
		3120
2739	my $face;	3121	my $face;
2740		3122
2741	if ($self->{frame}) {	3123	if ($self->{frame}) {
2742	my $anim = $::CONN->{anim}[$self->{anim}];	3124	my $anim = $::CONN->{anim}[$self->{anim}];
2743		3125
…		…
2748	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749		3131
2750	if ($tex) {	3132	if ($tex) {
2751	glEnable GL_TEXTURE_2D;	3133	glEnable GL_TEXTURE_2D;
2752	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753	glColor 1, 1, 1, 1;	3135	glColor 0, 0, 0, 1;
2754	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3136	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755	glDisable GL_TEXTURE_2D;	3137	glDisable GL_TEXTURE_2D;
2756	}	3138	}
2757	}	3139	}
2758		3140
2759	sub DESTROY {	3141	sub destroy {
2760	my ($self) = @_;	3142	my ($self) = @_;
2761		3143
2762	$self->{timer}->cancel	3144	$self->{timer}->cancel
2763	if $self->{timer};	3145	if $self->{timer};
2764		3146
2765	$self->SUPER::DESTROY;	3147	$self->SUPER::destroy;
2766	}	3148	}
2767		3149
2768	#############################################################################	3150	#############################################################################
2769		3151
2770	package CFClient::UI::Inventory;	3152	package CFClient::UI::Buttonbar;
2771		3153
2772	our @ISA = CFClient::UI::ScrolledWindow::;	3154	our @ISA = CFClient::UI::HBox::;
2773		3155
2774	sub new {	3156	# TODO: should actualyl wrap buttons and other goodies.
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
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});
2805
2806	$row++;
2807	}
2808	}
2809		3157
2810	#############################################################################	3158	#############################################################################
2811		3159
2812	package CFClient::UI::Menu;	3160	package CFClient::UI::Menu;
2813		3161
…		…
2825	);	3173	);
2826		3174
2827	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2828		3176
2829	for my $item (@{ $self->{items} }) {	3177	for my $item (@{ $self->{items} }) {
2830	my ($widget, $cb) = @$item;	3178	my ($widget, $cb, $tooltip) = @$item;
2831		3179
2832	# handle various types of items, only text for now	3180	# handle various types of items, only text for now
2833	if (!ref $widget) {	3181	if (!ref $widget) {
		3182	if ($widget =~ /\t/) {
		3183	my ($left, $right) = split /\t/, $widget, 2;
		3184
		3185	$widget = new CFClient::UI::HBox
		3186	can_hover => 1,
		3187	can_events => 1,
		3188	tooltip => $tooltip,
		3189	children => [
		3190	(new CFClient::UI::Label markup => $left, expand => 1),
		3191	(new CFClient::UI::Label markup => $right, align => +1),
		3192	],
		3193	;
		3194
		3195	} else {
2834	$widget = new CFClient::UI::Label	3196	$widget = new CFClient::UI::Label
2835	can_hover => 1,	3197	can_hover => 1,
2836	can_events => 1,	3198	can_events => 1,
2837	text => $widget;	3199	markup => $widget,
		3200	tooltip => $tooltip;
		3201	}
2838	}	3202	}
2839		3203
2840	$self->{item}{$widget} = $item;	3204	$self->{item}{$widget} = $item;
2841		3205
2842	$self->{vbox}->add ($widget);	3206	$self->{vbox}->add ($widget);
…		…
2847		3211
2848	# popup given the event (must be a mouse button down event currently)	3212	# popup given the event (must be a mouse button down event currently)
2849	sub popup {	3213	sub popup {
2850	my ($self, $ev) = @_;	3214	my ($self, $ev) = @_;
2851		3215
2852	$self->_emit ("popdown");	3216	$self->emit ("popdown");
2853		3217
2854	# maybe save $GRAB? must be careful about events...	3218	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	3219	$GRAB = $self;
2856	$self->{button} = $ev->{button};	3220	$self->{button} = $ev->{button};
2857		3221
2858	$self->show;	3222	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3223	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	3224	}
2861		3225
2862	sub mouse_motion {	3226	sub invoke_mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	3227	my ($self, $ev, $x, $y) = @_;
2864		3228
2865	# TODO: should use vbox->find_widget or so	3229	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3230	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	3231	$self->{hover} = $self->{item}{$HOVER};
2868	}
2869		3232
		3233	0
		3234	}
		3235
2870	sub button_up {	3236	sub invoke_button_up {
2871	my ($self, $ev, $x, $y) = @_;	3237	my ($self, $ev, $x, $y) = @_;
2872		3238
2873	if ($ev->{button} == $self->{button}) {	3239	if ($ev->{button} == $self->{button}) {
2874	undef $GRAB;	3240	undef $GRAB;
2875	$self->hide;	3241	$self->hide;
2876		3242
2877	$self->_emit ("popdown");	3243	$self->emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	3244	$self->{hover}[1]->() if $self->{hover};
		3245	} else {
		3246	return 0
		3247	}
		3248
2879	}	3249	1
2880	}	3250	}
2881		3251
2882	#############################################################################	3252	#############################################################################
2883		3253
2884	package CFClient::UI::Statusbox;	3254	package CFClient::UI::Multiplexer;
2885		3255
2886	our @ISA = CFClient::UI::VBox::;	3256	our @ISA = CFClient::UI::Container::;
2887		3257
2888	sub new {	3258	sub new {
2889	my $class = shift;	3259	my $class = shift;
2890		3260
2891	$class->SUPER::new (	3261	my $self = $class->SUPER::new (
		3262	@_,
		3263	);
		3264
		3265	$self->{current} = $self->{children}[0]
		3266	if @{ $self->{children} };
		3267
		3268	$self
		3269	}
		3270
		3271	sub add {
		3272	my ($self, @widgets) = @_;
		3273
		3274	$self->SUPER::add (@widgets);
		3275
		3276	$self->{current} = $self->{children}[0]
		3277	if @{ $self->{children} };
		3278	}
		3279
		3280	sub get_current_page {
		3281	my ($self) = @_;
		3282
		3283	$self->{current}
		3284	}
		3285
		3286	sub set_current_page {
		3287	my ($self, $page_or_widget) = @_;
		3288
		3289	my $widget = ref $page_or_widget
		3290	? $page_or_widget
		3291	: $self->{children}[$page_or_widget];
		3292
		3293	$self->{current} = $widget;
		3294	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3295
		3296	$self->emit (page_changed => $self->{current});
		3297
		3298	$self->realloc;
		3299	}
		3300
		3301	sub visible_children {
		3302	$_[0]{current}
		3303	}
		3304
		3305	sub size_request {
		3306	my ($self) = @_;
		3307
		3308	$self->{current}->size_request
		3309	}
		3310
		3311	sub invoke_size_allocate {
		3312	my ($self, $w, $h) = @_;
		3313
		3314	$self->{current}->configure (0, 0, $w, $h);
		3315
		3316	1
		3317	}
		3318
		3319	sub _draw {
		3320	my ($self) = @_;
		3321
		3322	$self->{current}->draw;
		3323	}
		3324
		3325	#############################################################################
		3326
		3327	package CFClient::UI::Notebook;
		3328
		3329	our @ISA = CFClient::UI::VBox::;
		3330
		3331	sub new {
		3332	my $class = shift;
		3333
		3334	my $self = $class->SUPER::new (
		3335	buttonbar => (new CFClient::UI::Buttonbar),
		3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3337	# filter => # will be put between multiplexer and $self
		3338	@_,
		3339	);
		3340
		3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3342	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3343
		3344	$self
		3345	}
		3346
		3347	sub add {
		3348	my ($self, $title, $widget, $tooltip) = @_;
		3349
		3350	Scalar::Util::weaken $self;
		3351
		3352	$self->{buttonbar}->add (new CFClient::UI::Button
		3353	markup => $title,
		3354	tooltip => $tooltip,
		3355	on_activate => sub { $self->set_current_page ($widget) },
		3356	);
		3357
		3358	$self->{multiplexer}->add ($widget);
		3359	}
		3360
		3361	sub get_current_page {
		3362	my ($self) = @_;
		3363
		3364	$self->{multiplexer}->get_current_page
		3365	}
		3366
		3367	sub set_current_page {
		3368	my ($self, $page) = @_;
		3369
		3370	$self->{multiplexer}->set_current_page ($page);
		3371	$self->emit (page_changed => $self->{multiplexer}{current});
		3372	}
		3373
		3374	#############################################################################
		3375
		3376	package CFClient::UI::Selector;
		3377
		3378	use utf8;
		3379
		3380	our @ISA = CFClient::UI::Button::;
		3381
		3382	sub new {
		3383	my $class = shift;
		3384
		3385	my $self = $class->SUPER::new (
		3386	options => [], # [value, title, longdesc], ...
		3387	value => undef,
		3388	@_,
		3389	);
		3390
		3391	$self->_set_value ($self->{value});
		3392
		3393	$self
		3394	}
		3395
		3396	sub invoke_button_down {
		3397	my ($self, $ev) = @_;
		3398
		3399	my @menu_items;
		3400
		3401	for (@{ $self->{options} }) {
		3402	my ($value, $title, $tooltip) = @$_;
		3403
		3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3405	}
		3406
		3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3408	}
		3409
		3410	sub _set_value {
		3411	my ($self, $value) = @_;
		3412
		3413	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3414	or return;
		3415
		3416	$self->{value} = $item->[0];
		3417	$self->set_markup ("$item->[1] ⇓");
		3418	$self->set_tooltip ($item->[2]);
		3419	}
		3420
		3421	sub set_value {
		3422	my ($self, $value) = @_;
		3423
		3424	return unless $self->{value} ne $value;
		3425
		3426	$self->_set_value ($value);
		3427	$self->emit (changed => $value);
		3428	}
		3429
		3430	#############################################################################
		3431
		3432	package CFClient::UI::Statusbox;
		3433
		3434	our @ISA = CFClient::UI::VBox::;
		3435
		3436	sub new {
		3437	my $class = shift;
		3438
		3439	my $self = $class->SUPER::new (
2892	fontsize => 0.8,	3440	fontsize => 0.8,
2893	@_,	3441	@_,
2894	)	3442	);
		3443
		3444	Scalar::Util::weaken (my $this = $self);
		3445
		3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3447
		3448	$self
2895	}	3449	}
2896		3450
2897	sub reorder {	3451	sub reorder {
2898	my ($self) = @_;	3452	my ($self) = @_;
2899	my $NOW = time;	3453	my $NOW = Time::HiRes::time;
		3454
		3455	# freeze display when hovering over any label
		3456	return if $CFClient::UI::TOOLTIP->{owner}
		3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3458	values %{ $self->{item} };
2900		3459
2901	while (my ($k, $v) = each %{ $self->{item} }) {	3460	while (my ($k, $v) = each %{ $self->{item} }) {
2902	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903	}	3462	}
2904		3463
…		…
2907	my @items = sort {	3466	my @items = sort {
2908	$a->{pri} <=> $b->{pri}	3467	$a->{pri} <=> $b->{pri}
2909	or $b->{id} <=> $a->{id}	3468	or $b->{id} <=> $a->{id}
2910	} values %{ $self->{item} };	3469	} values %{ $self->{item} };
2911		3470
		3471	$self->{timer}->interval (1);
		3472
2912	my $count = 10 + 1;	3473	my $count = 10 + 1;
2913	for my $item (@items) {	3474	for my $item (@items) {
2914	last unless --$count;	3475	last unless --$count;
2915		3476
2916	push @widgets, $item->{label} ||= do {	3477	my $label = $item->{label} ||= do {
2917	# TODO: doesn't handle markup well (read as: at all)	3478	# TODO: doesn't handle markup well (read as: at all)
2918	my $short = $item->{count} > 1	3479	my $short = $item->{count} > 1
2919	? "<b>$item->{count} ×</b> $item->{text}"	3480	? "<b>$item->{count} ×</b> $item->{text}"
2920	: $item->{text};	3481	: $item->{text};
2921		3482
…		…
2929	tooltip => $item->{tooltip},	3490	tooltip => $item->{tooltip},
2930	tooltip_font => $::FONT_PROP,	3491	tooltip_font => $::FONT_PROP,
2931	tooltip_width => 0.67,	3492	tooltip_width => 0.67,
2932	fontsize => $item->{fontsize} || $self->{fontsize},	3493	fontsize => $item->{fontsize} || $self->{fontsize},
2933	max_w => $::WIDTH * 0.44,	3494	max_w => $::WIDTH * 0.44,
2934	fg => $item->{fg},	3495	fg => [@{ $item->{fg} }],
2935	can_events => 1,	3496	can_events => 1,
2936	can_hover => 1	3497	can_hover => 1
2937	};	3498	};
		3499
		3500	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3501	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3502	$label->update;
		3503	$label->set_max_size (undef, $label->{req_h} * $diff)
		3504	if $diff < 1;
		3505	$self->{timer}->interval (1/30);
		3506	} else {
		3507	$label->{fg}[3] = $item->{fg}[3] || 1;
		3508	}
		3509
		3510	push @widgets, $label;
2938	}	3511	}
2939		3512
2940	$self->clear;	3513	$self->clear;
2941	$self->SUPER::add (reverse @widgets);	3514	$self->SUPER::add (reverse @widgets);
2942	}	3515	}
…		…
2947	$text =~ s/^\s+//;	3520	$text =~ s/^\s+//;
2948	$text =~ s/\s+$//;	3521	$text =~ s/\s+$//;
2949		3522
2950	return unless $text;	3523	return unless $text;
2951		3524
2952	my $timeout = time + ((delete $arg{timeout}) || 60);	3525	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953		3526
2954	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3527	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955		3528
2956	if (my $item = $self->{item}{$group}) {	3529	if (my $item = $self->{item}{$group}) {
2957	if ($item->{text} eq $text) {	3530	if ($item->{text} eq $text) {
2958	$item->{count}++;	3531	$item->{count}++;
2959	} else {	3532	} else {
2960	$item->{count} = 1;	3533	$item->{count} = 1;
2961	$item->{text} = $item->{tooltip} = $text;	3534	$item->{text} = $item->{tooltip} = $text;
2962	}	3535	}
2963	$item->{id} = ++$self->{id};	3536	$item->{id} += 0.2;#d#
2964	$item->{timeout} = $timeout;	3537	$item->{timeout} = $timeout;
2965	delete $item->{label};	3538	delete $item->{label};
2966	} else {	3539	} else {
2967	$self->{item}{$group} = {	3540	$self->{item}{$group} = {
2968	id => ++$self->{id},	3541	id => ++$self->{id},
…		…
2974	count => 1,	3547	count => 1,
2975	%arg,	3548	%arg,
2976	};	3549	};
2977	}	3550	}
2978		3551
		3552	$ROOT->on_refresh (reorder => sub {
2979	$self->reorder;	3553	$self->reorder;
		3554	});
2980	}	3555	}
2981		3556
2982	sub reconfigure {	3557	sub reconfigure {
2983	my ($self) = @_;	3558	my ($self) = @_;
2984		3559
…		…
2987		3562
2988	$self->reorder;	3563	$self->reorder;
2989	$self->SUPER::reconfigure;	3564	$self->SUPER::reconfigure;
2990	}	3565	}
2991		3566
		3567	sub destroy {
		3568	my ($self) = @_;
		3569
		3570	$self->{timer}->cancel;
		3571
		3572	$self->SUPER::destroy;
		3573	}
		3574
2992	#############################################################################	3575	#############################################################################
2993		3576
		3577	package CFClient::UI::Inventory;
		3578
		3579	our @ISA = CFClient::UI::Table::;
		3580
		3581	sub new {
		3582	my $class = shift;
		3583
		3584	my $self = $class->SUPER::new (
		3585	col_expand => [0, 1, 0],
		3586	items => [],
		3587	@_,
		3588	);
		3589
		3590	$self->set_sort_order (undef);
		3591
		3592	$self
		3593	}
		3594
		3595	sub update_items {
		3596	my ($self) = @_;
		3597
		3598	$self->clear;
		3599
		3600	my @item = $self->{sort}->(@{ $self->{items} });
		3601
		3602	my @adds;
		3603	my $row = 0;
		3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3605	CFClient::Item::update_widgets $item;
		3606
		3607	push @adds, 0, $row, $item->{face_widget};
		3608	push @adds, 1, $row, $item->{desc_widget};
		3609	push @adds, 2, $row, $item->{weight_widget};
		3610
		3611	$row++;
		3612	}
		3613
		3614	$self->add (@adds);
		3615	}
		3616
		3617	sub set_sort_order {
		3618	my ($self, $order) = @_;
		3619
		3620	$self->{sort} = $order ||= sub {
		3621	sort {
		3622	$a->{type} <=> $b->{type}
		3623	or $a->{name} cmp $b->{name}
		3624	} @_
		3625	};
		3626
		3627	$self->update_items;
		3628	}
		3629
		3630	sub set_items {
		3631	my ($self, $items) = @_;
		3632
		3633	$self->{items} = [$items ? values %$items : ()];
		3634	$self->update_items;
		3635	}
		3636
		3637	#############################################################################
		3638
		3639	package CFClient::UI::SpellList;
		3640
		3641	our @ISA = CFClient::UI::Table::;
		3642
		3643	sub new {
		3644	my $class = shift;
		3645
		3646	my $self = $class->SUPER::new (
		3647	binding => [],
		3648	commands => [],
		3649	@_,
		3650	)
		3651	}
		3652
		3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3654
		3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3665
		3666	sub rebuild_spell_list {
		3667	my ($self) = @_;
		3668
		3669	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3670	$self->clear;
		3671
		3672	return unless $::CONN;
		3673
		3674	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3675	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3676	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3677	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3678	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3679
		3680	my $row = 0;
		3681
		3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3683	my $spell = $self->{spell}{$_};
		3684
		3685	$row++;
		3686
		3687	my $spell_cb = sub {
		3688	my ($widget, $ev) = @_;
		3689
		3690	if ($ev->{button} == 1) {
		3691	$::CONN->user_send ("cast $spell->{name}");
		3692	} elsif ($ev->{button} == 2) {
		3693	$::CONN->user_send ("invoke $spell->{name}");
		3694	} elsif ($ev->{button} == 3) {
		3695	(new CFClient::UI::Menu
		3696	items => [
		3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3699	],
		3700	)->popup ($ev);
		3701	} else {
		3702	return 0;
		3703	}
		3704
		3705	1
		3706	};
		3707
		3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3709
		3710	#TODO: add path info to tooltip
		3711	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3712
		3713	$self->add (0, $row, new CFClient::UI::Face
		3714	face => $spell->{face},
		3715	can_hover => 1,
		3716	can_events => 1,
		3717	tooltip => $tooltip,
		3718	on_button_down => $spell_cb,
		3719	);
		3720
		3721	$self->add (1, $row, new CFClient::UI::Label
		3722	expand => 1,
		3723	text => $spell->{name},
		3724	can_hover => 1,
		3725	can_events => 1,
		3726	tooltip => $tooltip,
		3727	on_button_down => $spell_cb,
		3728	);
		3729
		3730	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3731	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3732	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3733	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3734	}
		3735	});
		3736	}
		3737
		3738	sub add_spell {
		3739	my ($self, $spell) = @_;
		3740
		3741	$self->{spell}->{$spell->{name}} = $spell;
		3742	$self->rebuild_spell_list;
		3743	}
		3744
		3745	sub remove_spell {
		3746	my ($self, $spell) = @_;
		3747
		3748	delete $self->{spell}->{$spell->{name}};
		3749	$self->rebuild_spell_list;
		3750	}
		3751
		3752	sub clear_spells {
		3753	my ($self) = @_;
		3754
		3755	$self->{spell} = {};
		3756	$self->rebuild_spell_list;
		3757	}
		3758
		3759	#############################################################################
		3760
2994	package CFClient::UI::Root;	3761	package CFClient::UI::Root;
2995		3762
2996	our @ISA = CFClient::UI::Container::;	3763	our @ISA = CFClient::UI::Container::;
		3764
		3765	use List::Util qw(min max);
2997		3766
2998	use CFClient::OpenGL;	3767	use CFClient::OpenGL;
2999		3768
3000	sub new {	3769	sub new {
3001	my $class = shift;	3770	my $class = shift;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3777	Scalar::Util::weaken ($self->{root} = $self);
3009		3778
3010	$self	3779	$self
3011	}	3780	}
3012		3781
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3782	sub size_request {
3030	my ($self) = @_;	3783	my ($self) = @_;
3031		3784
3032	($self->{w}, $self->{h})	3785	($self->{w}, $self->{h})
3033	}	3786	}
…		…
3044	$coord = $max - $size if $coord > $max - $size;	3797	$coord = $max - $size if $coord > $max - $size;
3045		3798
3046	int $coord + 0.5	3799	int $coord + 0.5
3047	}	3800	}
3048		3801
3049	sub size_allocate {	3802	sub invoke_size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3803	my ($self, $w, $h) = @_;
3051		3804
3052	for my $child ($self->children) {	3805	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3806	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3807
3055	$X = $child->{force_x} if exists $child->{force_x};	3808	$X = $child->{force_x} if exists $child->{force_x};
…		…
3058	$X = _to_pixel $X, $W, $self->{w};	3811	$X = _to_pixel $X, $W, $self->{w};
3059	$Y = _to_pixel $Y, $H, $self->{h};	3812	$Y = _to_pixel $Y, $H, $self->{h};
3060		3813
3061	$child->configure ($X, $Y, $W, $H);	3814	$child->configure ($X, $Y, $W, $H);
3062	}	3815	}
		3816
		3817	1
3063	}	3818	}
3064		3819
3065	sub coord2local {	3820	sub coord2local {
3066	my ($self, $x, $y) = @_;	3821	my ($self, $x, $y) = @_;
3067		3822
…		…
3123	$_->()	3878	$_->()
3124	for values %{delete $self->{refresh_hook}};	3879	for values %{delete $self->{refresh_hook}};
3125	}	3880	}
3126		3881
3127	if ($self->{realloc}) {	3882	if ($self->{realloc}) {
		3883	my %queue;
3128	my @queue;	3884	my @queue;
		3885	my $widget;
3129		3886
		3887	outer:
3130	while () {	3888	while () {
3131	if ($self->{realloc}) {	3889	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3890	for $widget (values %$realloc) {
		3891	$widget->{visible} or next; # do not resize invisible widgets
3133		3892
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3893	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3894
		3895	push @{ $queue[$widget->{visible}] }, $widget;
		3896	}
3136	}	3897	}
3137		3898
		3899	while () {
		3900	@queue or last outer;
		3901
3138	my $widget = pop @queue || last;	3902	$widget = pop @{ $queue[-1] || [] }
		3903	and last;
		3904
		3905	pop @queue;
		3906	}
3139		3907
3140	$widget->{visible} or last; # do not resize invisible widgets	3908	delete $queue{$widget+0};
3141		3909
3142	my ($w, $h) = $widget->size_request;	3910	my ($w, $h) = $widget->size_request;
3143		3911
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;	3912	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3913	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145		3914
3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;	3915	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;	3916	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148		3917
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3918	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3919	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3920
		3921	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3922	|| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3923	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3924	$widget->{req_h} = $h;
3154		3925
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3926	$self->{size_alloc}{$widget+0} = $widget;
3156		3927
3157	push @queue, $widget->{parent}	3928	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3929	$self->{realloc}{$parent+0} = $parent
		3930	unless $queue{$parent+0};
		3931
		3932	$parent->{force_size_alloc} = 1;
		3933	$self->{size_alloc}{$parent+0} = $parent;
		3934	}
		3935	}
		3936
		3937	delete $self->{realloc}{$widget+0};
3159	}	3938	}
3160	}	3939	}
3161		3940
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3941	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3942	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3943	values %$size_alloc;
3165		3944
3166	while () {	3945	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3946	my $widget = pop @queue || last;
3168		3947
3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3171		3949
3172	$w = 0 if $w < 0;	3950	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3951	$h = 0 if $h < 0;
3174		3952
		3953	$w = max $widget->{min_w}, $w;
		3954	$h = max $widget->{min_h}, $h;
		3955
		3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3958
		3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3961
3175	$w = int $w + 0.5;	3962	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3963	$h = int $h + 0.5;
3177		3964
3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3966	$widget->{old_w} = $widget->{w};
		3967	$widget->{old_h} = $widget->{h};
3179		3968
3180	$widget->{w} = $w;	3969	$widget->{w} = $w;
3181	$widget->{h} = $h;	3970	$widget->{h} = $h;
3182		3971
3183	$widget->emit (size_allocate => $w, $h, $changed);	3972	$widget->emit (size_allocate => $w, $h);
		3973	}
3184	}	3974	}
3185	}	3975	}
3186		3976
3187	while ($self->{post_alloc_hook}) {	3977	while ($self->{post_alloc_hook}) {
3188	$_->()	3978	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3979	for values %{delete $self->{post_alloc_hook}};
3190	}	3980	}
		3981
3191		3982
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3985	glClear GL_COLOR_BUFFER_BIT;
3195		3986
…		…
3197	glLoadIdentity;	3988	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3990	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3991	glLoadIdentity;
3201		3992
		3993	{
		3994	package CFClient::UI::Base;
		3995
		3996	($draw_x, $draw_y, $draw_w, $draw_h) =
		3997	(0, 0, $self->{w}, $self->{h});
		3998	}
		3999
3202	$self->_draw;	4000	$self->_draw;
3203	}	4001	}
3204		4002
3205	#############################################################################	4003	#############################################################################
3206		4004

Diff Legend

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