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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
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
20		21
21	sub get_layout {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};
29	}
30
31	return $LAYOUT;
32	}
33
34	sub set_layout {
35	my ($layout) = @_;
36	$LAYOUT = $layout;
37	}
38
39	sub check_tooltip {
40	if (!$GRAB) {	23	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
45	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
46		34
47	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
48		36
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		38
51	$TOOLTIP->set_tooltip_from ($widget);	39	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	40	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->realloc;
61	}	41	}
62		42
63	return;	43	return;
64	}	44	}
65	}	45	}
66	}	46	}
67		47
68	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
69	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
		51	});
		52
		53	sub get_layout {
		54	my $layout;
		55
		56	for (grep { $_->{name} } values %WIDGET) {
		57	my $win = $layout->{$_->{name}} = { };
		58
		59	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		60	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		61	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		62	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		63
		64	$win->{show} = $_->{visible} && $_->{is_toplevel};
		65	}
		66
		67	$layout
		68	}
		69
		70	sub set_layout {
		71	my ($layout) = @_;
		72
		73	$LAYOUT = $layout;
70	}	74	}
71		75
72	# class methods for events	76	# class methods for events
73	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	78	$FOCUS->emit (key_down => $_[0])
…		…
78	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
79	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
80	if $FOCUS;	84	if $FOCUS;
81	}	85	}
82		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
83	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
84	my ($ev) = @_;	101	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
86		103
87	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
88	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
89		108
90	$GRAB = $widget;	109	$GRAB = $widget;
91	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
92		111
93	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
94	}	113	}
95		114
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97		120
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
99	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
100	}	129	}
101		130
102	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
103	my ($ev) = @_;	132	my ($ev) = @_;
104	my ($x, $y) = ($ev->{x}, $ev->{y});
105		133
106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107		135
108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109		137
110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
111	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112		140
113	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	143	$grab->update if $grab;
116	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
117		145
118	check_tooltip;	146	check_hover $widget;
		147	$TOOLTIP_WATCHER->cb->();
119	}	148	}
120	}	149	}
121		150
122	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
123	my ($ev) = @_;	152	my ($ev) = @_;
124	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
125		154
126	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127		156
128	if ($widget != $HOVER) {	157	check_hover $widget;
129	my $hover = $HOVER; $HOVER = $widget;
130		158
131	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
132	$HOVER->update if $HOVER && $HOVER->{can_hover};
133
134	check_tooltip;
135	}
136
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	160	if $HOVER;
139	}	161	}
140		162
141	# convert position array to integers	163	# convert position array to integers
142	sub harmonize {	164	sub harmonize {
…		…
171	sub rescale_widgets {	193	sub rescale_widgets {
172	my ($sx, $sy) = @_;	194	my ($sx, $sy) = @_;
173		195
174	for my $widget (values %WIDGET) {	196	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	197	if ($widget->{is_toplevel}) {
		198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		200
176	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
178	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	203	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
179	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	204	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
180	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	205	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
181	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	206	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		207
		208	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		209	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		210
182	}	211	}
183	}	212	}
184		213
185	reconfigure_widgets;	214	reconfigure_widgets;
186	}	215	}
187		216
188	#############################################################################	217	#############################################################################
189		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
190	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
191		228
192	use strict;	229	use strict;
193		230
194	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
195		232
196	sub new {	233	sub new {
197	my $class = shift;	234	my $class = shift;
198		235
199	my $self = bless {	236	my $self = bless {
200	x => 0,	237	x => "center",
201	y => 0,	238	y => "center",
202	z => 0,	239	z => 0,
		240	w => undef,
		241	h => undef,
203	can_events => 1,	242	can_events => 1,
204	@_	243	@_
205	}, $class;	244	}, $class;
		245
		246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
206		247
207	for (keys %$self) {	248	for (keys %$self) {
208	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
209	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
210	}	251	}
211	}	252	}
212		253
213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
216	$self->{req_x} = $layout->{x} * $::WIDTH;	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
217	$self->{req_y} = $layout->{y} * $::HEIGHT;	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		259
		260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		262
		263	$self->show if $layout->{show};
220	}	264	}
221		265
222	$self	266	$self
223	}	267	}
224		268
225	sub destroy {	269	sub destroy {
226	my ($self) = @_;	270	my ($self) = @_;
227		271
228	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
229	%$self = ();	274	%$self = ();
230	}	275	}
231		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
232	sub show {	281	sub show {
233	my ($self) = @_;	282	my ($self) = @_;
234		283
235	return if $self->{parent};	284	return if $self->{parent};
236		285
237	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
238	}
239
240	sub center {
241	my ($self) = @_;
242
243	$CFClient::UI::ROOT->on_post_alloc (
244	"center_$self" => sub {
245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246	},
247	);
248
249	$self->update;
250	}	287	}
251		288
252	sub set_visible {	289	sub set_visible {
253	my ($self) = @_;	290	my ($self) = @_;
254		291
…		…
257	$self->{root} = $self->{parent}{root};	294	$self->{root} = $self->{parent}{root};
258	$self->{visible} = $self->{parent}{visible} + 1;	295	$self->{visible} = $self->{parent}{visible} + 1;
259		296
260	$self->emit (visibility_change => 1);	297	$self->emit (visibility_change => 1);
261		298
262	$self->realloc unless exists $self->{req_w};	299	$self->realloc if !exists $self->{req_w};
263		300
264	$_->set_visible for $self->children;	301	$_->set_visible for $self->children;
265	}	302	}
266		303
267	sub set_invisible {	304	sub set_invisible {
…		…
269		306
270	return unless $self->{visible};	307	return unless $self->{visible};
271		308
272	$_->set_invisible for $self->children;	309	$_->set_invisible for $self->children;
273		310
		311	delete $self->{visible};
274	delete $self->{root};	312	delete $self->{root};
275	delete $self->{visible};
276		313
277	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
278	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
279		316
280	CFClient::UI::check_tooltip	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
281	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
282		319
283	$self->focus_out;	320	$self->emit ("focus_out");
284
285	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
286	}	322	}
287		323
288	sub set_visibility {	324	sub set_visibility {
289	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
290		326
291	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
292		328
293	$visible ? $self->hide	329	$visible ? $self->show
294	: $self->show;	330	: $self->hide;
295	}	331	}
296		332
297	sub toggle_visibility {	333	sub toggle_visibility {
298	my ($self) = @_;	334	my ($self) = @_;
299		335
…		…
309		345
310	$self->{parent}->remove ($self)	346	$self->{parent}->remove ($self)
311	if $self->{parent};	347	if $self->{parent};
312	}	348	}
313		349
314	sub move {	350	sub move_abs {
315	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
316		352
317	$self->{x} = int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318	$self->{y} = int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
320		356
321	$self->update;	357	$self->update;
322	}	358	}
323		359
324	sub set_size {	360	sub set_size {
325	my ($self, $w, $h) = @_;	361	my ($self, $w, $h) = @_;
326		362
327	$self->{def_w} = $w;	363	$self->{force_w} = $w;
328	$self->{def_h} = $h;	364	$self->{force_h} = $h;
329		365
330	$self->realloc;	366	$self->realloc;
331	}	367	}
332		368
333	sub size_request {	369	sub size_request {
334	require Carp;	370	require Carp;
335	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
336	}	372	}
337		373
		374	sub baseline_shift {
		375	0
		376	}
		377
338	sub configure {	378	sub configure {
339	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
340		380
341	if ($self->{aspect}) {	381	if ($self->{aspect}) {
		382	my ($ow, $oh) = ($w, $h);
		383
342	my $w2 = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
343	my $h2 = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
344		386
345	# use alignment to adjust x, y	387	# use alignment to adjust x, y
346		388
347	$x += int +($w - $w2) * 0.5;	389	$x += int 0.5 * ($ow - $w);
348	$y += int +($h - $h2) * 0.5;	390	$y += int 0.5 * ($oh - $h);
349
350	($w, $h) = ($w2, $h2);
351	}	391	}
352		392
353	if ($self->{x} != $x || $self->{y} != $y) {	393	if ($self->{x} ne $x || $self->{y} ne $y) {
354	$self->{x} = $x;	394	$self->{x} = $x;
355	$self->{y} = $y;	395	$self->{y} = $y;
356	$self->update;	396	$self->update;
357	}	397	}
358		398
359	if ($self->{w} != $w || $self->{h} != $h) {	399	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360	return unless $self->{visible};	400	return unless $self->{visible};
361		401
		402	$self->{alloc_w} = $w;
		403	$self->{alloc_h} = $h;
		404
362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	405	$self->{root}{size_alloc}{$self+0} = $self;
363	}	406	}
364	}
365
366	sub size_allocate {
367	# nothing to be done
368	}	407	}
369		408
370	sub children {	409	sub children {
		410	# nop
		411	}
		412
		413	sub visible_children {
		414	$_[0]->children
371	}	415	}
372		416
373	sub set_max_size {	417	sub set_max_size {
374	my ($self, $w, $h) = @_;	418	my ($self, $w, $h) = @_;
375		419
376	delete $self->{max_w}; $self->{max_w} = $w if $w;	420	$self->{max_w} = int $w if defined $w;
377	delete $self->{max_h}; $self->{max_h} = $h if $h;	421	$self->{max_h} = int $h if defined $h;
		422
		423	$self->realloc;
378	}	424	}
379		425
380	sub set_tooltip {	426	sub set_tooltip {
381	my ($self, $tooltip) = @_;	427	my ($self, $tooltip) = @_;
382		428
…		…
385		431
386	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
387		433
388	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
389		435
390	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
391	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
392	CFClient::UI::check_tooltip;	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
393	}	439	}
394	}	440	}
395		441
396	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
397	sub coord2local {	443	sub coord2local {
398	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
399		445
		446	Carp::confess unless $self->{parent};#d#
		447
400	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
401	}	449	}
402		450
403	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
404	sub coord2global {	452	sub coord2global {
405	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
406		454
		455	Carp::confess unless $self->{parent};#d#
		456
407	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
408	}	458	}
409		459
410	sub focus_in {	460	sub invoke_focus_in {
411	my ($self) = @_;	461	my ($self) = @_;
412		462
413	return if $FOCUS == $self;	463	return if $FOCUS == $self;
414	return unless $self->{can_focus};	464	return unless $self->{can_focus};
415		465
416	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
417		467
418	$self->_emit (focus_in => $focus);	468	$self->update;
419		469
420	$focus->update if $focus;	470	0
421	$FOCUS->update;
422	}	471	}
423		472
424	sub focus_out {	473	sub invoke_focus_out {
425	my ($self) = @_;	474	my ($self) = @_;
426		475
427	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
428		477
429	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
430		479
431	$self->_emit (focus_out => $focus);	480	$self->update;
432		481
433	$focus->update if $focus; #?
434
435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
436	unless $FOCUS;	483	unless $FOCUS;
437	}
438		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
439	sub mouse_motion { }	495	sub invoke_mouse_motion { 0 }
440	sub button_up { }	496	sub invoke_button_up { 0 }
441	sub key_down { }	497	sub invoke_key_down { 0 }
442	sub key_up { }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
443		500
444	sub button_down {	501	sub invoke_button_down {
445	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
446		503
447	$self->focus_in;	504	$self->grab_focus;
448	}
449		505
450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	506	0
451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	507	}
452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455		508
		509	sub connect {
		510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
		532
		533	sub emit {
		534	my ($self, $signal, @args) = @_;
		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
456	sub find_widget {	556	#sub find_widget {
457	my ($self, $x, $y) = @_;	557	# in .xs
458
459	return () unless $self->{can_events};
460
461	return $self
462	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465	()
466	}
467		558
468	sub set_parent {	559	sub set_parent {
469	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
470		561
471	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
472
473	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
474
475	$self->realloc;
476	}
477
478	sub connect {
479	my ($self, $signal, $cb) = @_;
480
481	push @{ $self->{signal_cb}{$signal} }, $cb;
482	}
483
484	sub _emit {
485	my ($self, $signal, @args) = @_;
486
487	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488	}
489
490	sub emit {
491	my ($self, $signal, @args) = @_;
492
493	$self->_emit ($signal, @args)
494	|| $self->$signal (@args);
495	}
496
497	sub visibility_change {
498	#my ($self, $visible) = @_;
499	}	564	}
500		565
501	sub realloc {	566	sub realloc {
502	my ($self) = @_;	567	my ($self) = @_;
503		568
504	return unless $self->{visible};	569	if ($self->{visible}) {
505
506	return if $self->{root}{realloc}{$self};	570	return if $self->{root}{realloc}{$self+0};
507		571
508	$self->{root}{realloc}{$self} = $self;	572	$self->{root}{realloc}{$self+0} = $self;
509	$self->{root}->update;	573	$self->{root}->update;
		574	} else {
		575	delete $self->{req_w};
		576	delete $self->{req_h};
		577	}
510	}	578	}
511		579
512	sub update {	580	sub update {
513	my ($self) = @_;	581	my ($self) = @_;
514		582
515	$self->{parent}->update	583	$self->{parent}->update
516	if $self->{parent};	584	if $self->{parent};
517	}	585	}
518		586
		587	sub reconfigure {
		588	my ($self) = @_;
		589
		590	$self->realloc;
		591	$self->update;
		592	}
		593
		594	# using global variables seems a bit hacky, but passing through all drawing
		595	# functions seems pointless.
		596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		597
519	sub draw {	598	sub draw {
520	my ($self) = @_;	599	my ($self) = @_;
521		600
522	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
		602
		603	# update screen rectangle
		604	local $draw_x = $draw_x + $self->{x};
		605	local $draw_y = $draw_y + $self->{y};
		606
		607	# skip widgets that are entirely outside the drawing area
		608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523		610
524	glPushMatrix;	611	glPushMatrix;
525	glTranslate $self->{x}, $self->{y}, 0;	612	glTranslate $self->{x}, $self->{y}, 0;
526	$self->_draw;
527	glPopMatrix;
528		613
529	if ($self == $HOVER && $self->{can_hover}) {	614	if ($self == $HOVER && $self->{can_hover}) {
530	my ($x, $y) = @$self{qw(x y)};
531
532	glColor 1, 0.8, 0.5, 0.2;	615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533	glEnable GL_BLEND;	616	glEnable GL_BLEND;
534	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535	glBegin GL_QUADS;	618	glBegin GL_QUADS;
536	glVertex $x , $y;	619	glVertex 0 , 0;
537	glVertex $x + $self->{w}, $y;	620	glVertex $self->{w}, 0;
538	glVertex $x + $self->{w}, $y + $self->{h};	621	glVertex $self->{w}, $self->{h};
539	glVertex $x , $y + $self->{h};	622	glVertex 0 , $self->{h};
540	glEnd;	623	glEnd;
541	glDisable GL_BLEND;	624	glDisable GL_BLEND;
542	}	625	}
543		626
544	if ($ENV{PCLIENT_DEBUG}) {	627	if ($ENV{CFPLUS_DEBUG} & 1) {
545	glPushMatrix;	628	glPushMatrix;
546	glColor 1, 1, 0, 1;	629	glColor 1, 1, 0, 1;
547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	630	glTranslate 0.375, 0.375;
548	glBegin GL_LINE_LOOP;	631	glBegin GL_LINE_LOOP;
549	glVertex 0 , 0;	632	glVertex 0 , 0;
550	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
551	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
552	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
553	glEnd;	636	glEnd;
554	glPopMatrix;	637	glPopMatrix;
555	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556	}	639	}
		640
		641	$self->_draw;
		642	glPopMatrix;
557	}	643	}
558		644
559	sub _draw {	645	sub _draw {
560	my ($self) = @_;	646	my ($self) = @_;
561		647
562	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
563	}	649	}
564		650
		651	my $cntx;#d#
565	sub DESTROY {	652	sub DESTROY {
566	my ($self) = @_;	653	my ($self) = @_;
567		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
568	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
569	#$self->deactivate;
570	}	661	}
571		662
572	#############################################################################	663	#############################################################################
573		664
574	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
575		666
576	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
577		668
578	use strict;	669	use strict;
579	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
580		671
581	sub new {	672	sub new {
582	my $class = shift;	673	my $class = shift;
583		674
584	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
599		690
600	if ($color && (@$color < 4 || $color->[3])) {	691	if ($color && (@$color < 4 || $color->[3])) {
601	my ($w, $h) = @$self{qw(w h)};	692	my ($w, $h) = @$self{qw(w h)};
602		693
603	glEnable GL_BLEND;	694	glEnable GL_BLEND;
604	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glColor @$color;	696	glColor_premultiply @$color;
606		697
607	glBegin GL_QUADS;	698	glBegin GL_QUADS;
608	glVertex 0 , 0;	699	glVertex 0 , 0;
609	glVertex 0 , $h;	700	glVertex 0 , $h;
610	glVertex $w, $h;	701	glVertex $w, $h;
…		…
615	}	706	}
616	}	707	}
617		708
618	#############################################################################	709	#############################################################################
619		710
620	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
621		712
622	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
623		714
624	sub new {	715	sub new {
625	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
626	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
627	}	718	}
628		719
629	sub size_request {	720	sub size_request {
630	(0, 0)	721	my ($self) = @_;
		722
		723	($self->{w} + 0, $self->{h} + 0)
631	}	724	}
632		725
633	sub draw { }	726	sub draw { }
634		727
635	#############################################################################	728	#############################################################################
636		729
637	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
638		731
639	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
640		733
641	sub new {	734	sub new {
642	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
643		736
644	my $children = delete $arg{children} || [];	737	my $children = delete $arg{children};
645		738
646	my $self = $class->SUPER::new (	739	my $self = $class->SUPER::new (
647	children => [],	740	children => [],
648	can_events => 0,	741	can_events => 0,
649	%arg,	742	%arg,
650	);	743	);
		744
651	$self->add ($_) for @$children;	745	$self->add (@$children)
		746	if $children && @$children;
652		747
653	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
654	}	757	}
655		758
656	sub add {	759	sub add {
657	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
658		761
659	$_->set_parent ($self)	762	$_->set_parent ($self)
660	for @widgets;	763	for @widgets;
661		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
662	use sort 'stable';	766	use sort 'stable';
663		767
664	$self->{children} = [	768	$self->{children} = [
665	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
666	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
685	}	789	}
686		790
687	sub clear {	791	sub clear {
688	my ($self) = @_;	792	my ($self) = @_;
689		793
690	my $children = delete $self->{children};	794	my $children = $self->{children};
691	$self->{children} = [];	795	$self->{children} = [];
692		796
693	for (@$children) {	797	for (@$children) {
694	delete $_->{parent};	798	delete $_->{parent};
695	$_->hide;	799	$_->hide;
…		…
704	$x -= $self->{x};	808	$x -= $self->{x};
705	$y -= $self->{y};	809	$y -= $self->{y};
706		810
707	my $res;	811	my $res;
708		812
709	for (reverse @{ $self->{children} }) {	813	for (reverse $self->visible_children) {
710	$res = $_->find_widget ($x, $y)	814	$res = $_->find_widget ($x, $y)
711	and return $res;	815	and return $res;
712	}	816	}
713		817
714	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	818	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
720	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
721	}	825	}
722		826
723	#############################################################################	827	#############################################################################
724		828
725	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
726		830
727	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
728		832
729	sub new {	833	sub new {
730	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
731		835
732	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
733		837
734	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
735	}	839	}
736		840
737	sub add {	841	sub add {
738	my ($self, $child) = @_;	842	my ($self, $child) = @_;
739		843
740	$self->{children} = [];	844	$self->SUPER::remove ($_) for @{ $self->{children} };
741
742	$self->SUPER::add ($child);	845	$self->SUPER::add ($child);
743	}	846	}
744		847
745	sub remove {	848	sub remove {
746	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
747		850
748	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
749		852
750	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
751	unless @{$self->{children}};	854	unless @{$self->{children}};
752	}	855	}
753		856
754	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
755		858
756	sub size_request {	859	sub size_request {
757	$_[0]{children}[0]->size_request	860	$_[0]{children}[0]->size_request
758	}	861	}
759		862
760	sub size_allocate {	863	sub invoke_size_allocate {
761	my ($self, $w, $h, $changed) = @_;	864	my ($self, $w, $h) = @_;
762		865
763	$self->{children}[0]->configure (0, 0, $w, $h);	866	$self->{children}[0]->configure (0, 0, $w, $h);
		867
		868	1
764	}	869	}
765		870
766	#############################################################################	871	#############################################################################
767		872
		873	# back-buffered drawing area
		874
768	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
769		876
770	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
771		878
772	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
773		880
774	sub new {	881	sub new {
775	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
776		883
777	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
782		889
783	$ROOT->on_post_alloc ($self => sub { $self->render_child });	890	$ROOT->on_post_alloc ($self => sub { $self->render_child });
784	$self->SUPER::update;	891	$self->SUPER::update;
785	}	892	}
786		893
787	sub size_allocate {	894	sub invoke_size_allocate {
788	my ($self, $w, $h, $changed) = @_;	895	my ($self, $w, $h) = @_;
789		896
790	$self->SUPER::size_allocate ($w, $h, $changed);
791	$self->update	897	$self->update;
792	if $changed;	898
		899	$self->SUPER::invoke_size_allocate ($w, $h)
793	}	900	}
794		901
795	sub _render {	902	sub _render {
		903	my ($self) = @_;
		904
796	$_[0]{children}[0]->draw;	905	$self->{children}[0]->draw;
797	}	906	}
798		907
799	sub render_child {	908	sub render_child {
800	my ($self) = @_;	909	my ($self) = @_;
801		910
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
805		914
		915	{
		916	package CFPlus::UI::Base;
		917
		918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		919	(0, 0, $self->{w}, $self->{h});
		920
806	$self->_render;	921	$self->_render;
		922	}
807	};	923	};
808	}	924	}
809		925
810	sub _draw {	926	sub _draw {
811	my ($self) = @_;	927	my ($self) = @_;
812
813	my ($w, $h) = ($self->w, $self->h);
814		928
815	my $tex = $self->{texture}	929	my $tex = $self->{texture}
816	or return;	930	or return;
817		931
818	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820	glColor 1, 1, 1, 1;	934	glColor 0, 0, 0, 1;
821		935
822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
823		937
824	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
825	}	939	}
826		940
827	#############################################################################	941	#############################################################################
828		942
829	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
830		944
		945	use List::Util qw(min max);
		946
831	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
832		948
833	sub new {	949	sub new {
834	my $class = shift;	950	my $class = shift;
835		951
836	$class->SUPER::new (	952	$class->SUPER::new (
…		…
841	}	957	}
842		958
843	sub size_request {	959	sub size_request {
844	my ($self) = @_;	960	my ($self) = @_;
845		961
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		963
848	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
850		966
851	($w, $h)	967	($w, $h)
852	}	968	}
853		969
854	sub size_allocate {	970	sub invoke_size_allocate {
855	my ($self, $w, $h, $changed) = @_;	971	my ($self, $w, $h) = @_;
856		972
		973	my $child = $self->child;
		974
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	975	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	976	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		977
860	$self->child->configure (0, 0, $w, $h);	978	$self->child->configure (0, 0, $w, $h);
861	$self->update;	979	$self->update;
		980
		981	1
862	}	982	}
863		983
864	sub set_offset {	984	sub set_offset {
865	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
866		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
867	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
868	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
869		993
		994	$self->emit (changed => $x, $y);
870	$self->update;	995	$self->update;
		996	}
871	}	997	}
872		998
873	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
874	sub coord2local {	1000	sub coord2local {
875	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
890	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
891		1017
892	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
894	) {	1020	) {
895	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896	} else {	1022	} else {
897	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
898	}	1024	}
899	}	1025	}
900		1026
901	sub _render {	1027	sub _render {
902	my ($self) = @_;	1028	my ($self) = @_;
903		1029
		1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1032
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		1034
906	$self->SUPER::_render;	1035	$self->SUPER::_render;
907	}	1036	}
908		1037
909	#############################################################################	1038	#############################################################################
910		1039
911	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
912		1041
913	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
914		1043
915	sub new {	1044	sub new {
916	my $class = shift;	1045	my ($class, %arg) = @_;
		1046
		1047	my $child = delete $arg{child};
917		1048
918	my $self;	1049	my $self;
919		1050
920	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
921	vertical => 1,	1065	vertical => 1,
922	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
923	on_changed => sub {	1067	on_changed => sub {
924	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
925	},	1070	},
926	;	1071	;
927		1072
928	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
930	slider => $slider,	1077	hslider => $hslider,
931	@_,	1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
		1081	%arg,
932	);	1082	);
933		1083
934	$self->{vp}->add ($self->{scrolled});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
935	$self->add ($self->{vp});	1100	$self->SUPER::add ($self->{vp});
936	$self->add ($self->{slider});	1101
		1102	$self->add ($child) if $child;
937		1103
938	$self	1104	$self
939	}	1105	}
940		1106
		1107	sub add {
		1108	my ($self, $widget) = @_;
		1109
		1110	$self->{vp}->add ($self->{child} = $widget);
		1111	}
		1112
941	sub update {	1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider_visible}) {
		1123	$self->{hslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{hslider})
		1125	: $self->SUPER::remove ($self->{hslider});
		1126	}
		1127
		1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1130
		1131	my $visible = $h1 > $h2;
		1132	if ($visible != $self->{vslider_visible}) {
		1133	$self->{vslider_visible} = $visible;
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
		1139	sub start_dragging {
942	my ($self) = @_;	1140	my ($self, $ev) = @_;
943		1141
944	$self->SUPER::update;	1142	$self->grab_focus;
945		1143
946	# todo: overwrite size_allocate of child	1144	my $ox = $self->{vp}{view_x};
947	my $child = $self->{vp}->child;	1145	my $oy = $self->{vp}{view_y};
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1146
949	}	1147	$self->{motion} = sub {
		1148	my ($ev, $x, $y) = @_;
950		1149
		1150	$ox -= $ev->{xrel};
		1151	$oy -= $ev->{yrel};
		1152
		1153	$self->{vp}->set_offset ($ox, $oy);
		1154	};
		1155	}
		1156
		1157	sub invoke_mouse_wheel {
		1158	my ($self, $ev) = @_;
		1159
		1160	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1161	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1162
		1163	1
		1164	}
		1165
		1166	sub invoke_button_down {
		1167	my ($self, $ev, $x, $y) = @_;
		1168
		1169	if ($ev->{button} == 2) {
		1170	$self->start_dragging ($ev);
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_button_up {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if (delete $self->{motion}) {
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_mouse_motion {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if ($self->{motion}) {
		1191	$self->{motion}->($ev, $x, $y);
		1192	return 1;
		1193	}
		1194
		1195	0
		1196	}
		1197
951	sub size_allocate {	1198	sub invoke_size_allocate {
952	my ($self, $w, $h, $changed) = @_;	1199	my ($self, $w, $h) = @_;
953		1200
		1201	$self->update_slider;
954	$self->SUPER::size_allocate ($w, $h, $changed);	1202	$self->SUPER::invoke_size_allocate ($w, $h)
955
956	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1203	}
959
960	#TODO# update range on size_allocate depending on child
961	# update viewport offset on scroll
962		1204
963	#############################################################################	1205	#############################################################################
964		1206
965	package CFClient::UI::Frame;	1207	package CFPlus::UI::Frame;
966		1208
967	our @ISA = CFClient::UI::Bin::;	1209	our @ISA = CFPlus::UI::Bin::;
968		1210
969	use CFClient::OpenGL;	1211	use CFPlus::OpenGL;
970		1212
971	sub new {	1213	sub new {
972	my $class = shift;	1214	my $class = shift;
973		1215
974	$class->SUPER::new (	1216	$class->SUPER::new (
…		…
982		1224
983	if ($self->{bg}) {	1225	if ($self->{bg}) {
984	my ($w, $h) = @$self{qw(w h)};	1226	my ($w, $h) = @$self{qw(w h)};
985		1227
986	glEnable GL_BLEND;	1228	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1229	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988	glColor @{ $self->{bg} };	1230	glColor_premultiply @{ $self->{bg} };
989		1231
990	glBegin GL_QUADS;	1232	glBegin GL_QUADS;
991	glVertex 0 , 0;	1233	glVertex 0 , 0;
992	glVertex 0 , $h;	1234	glVertex 0 , $h;
993	glVertex $w, $h;	1235	glVertex $w, $h;
…		…
1000	$self->SUPER::_draw;	1242	$self->SUPER::_draw;
1001	}	1243	}
1002		1244
1003	#############################################################################	1245	#############################################################################
1004		1246
1005	package CFClient::UI::FancyFrame;	1247	package CFPlus::UI::FancyFrame;
1006		1248
1007	our @ISA = CFClient::UI::Bin::;	1249	our @ISA = CFPlus::UI::Bin::;
1008		1250
1009	use CFClient::OpenGL;	1251	use CFPlus::OpenGL;
1010
1011	my @tex =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1252
1015	sub new {	1253	sub new {
1016	my $class = shift;	1254	my ($class, %arg) = @_;
		1255
		1256	if ((exists $arg{label}) && !ref $arg{label}) {
		1257	$arg{label} = new CFPlus::UI::Label
		1258	align => 1,
		1259	valign => 0,
		1260	text => $arg{label},
		1261	fontsize => ($arg{border} || 0.8) * 0.75;
		1262	}
		1263
		1264	my $self = $class->SUPER::new (
		1265	# label => "",
		1266	fg => [0.6, 0.3, 0.1],
		1267	border => 0.8,
		1268	style => 'single',
		1269	%arg,
		1270	);
		1271
		1272	$self
		1273	}
		1274
		1275	sub add {
		1276	my ($self, @widgets) = @_;
		1277
		1278	$self->SUPER::add (@widgets);
		1279	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1280	}
		1281
		1282	sub border {
		1283	int $_[0]{border} * $::FONTSIZE
		1284	}
		1285
		1286	sub size_request {
		1287	my ($self) = @_;
		1288
		1289	($self->{label_w}, undef) = $self->{label}->size_request
		1290	if $self->{label};
		1291
		1292	my ($w, $h) = $self->SUPER::size_request;
		1293
		1294	(
		1295	$w + $self->border * 2,
		1296	$h + $self->border * 2,
		1297	)
		1298	}
		1299
		1300	sub invoke_size_allocate {
		1301	my ($self, $w, $h) = @_;
		1302
		1303	my $border = $self->border;
		1304
		1305	$w -= List::Util::max 0, $border * 2;
		1306	$h -= List::Util::max 0, $border * 2;
		1307
		1308	if (my $label = $self->{label}) {
		1309	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1310	$label->{h} = List::Util::min $h, $border;
		1311	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1312	}
		1313
		1314	$self->child->configure ($border, $border, $w, $h);
		1315
		1316	1
		1317	}
		1318
		1319	sub _draw {
		1320	my ($self) = @_;
		1321
		1322	my $child = $self->{children}[0];
		1323
		1324	my $border = $self->border;
		1325	my ($w, $h) = ($self->{w}, $self->{h});
		1326
		1327	$child->draw;
		1328
		1329	glColor @{$self->{fg}};
		1330	glBegin GL_LINE_STRIP;
		1331	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1337	glEnd;
		1338
		1339	if ($self->{label}) {
		1340	glTranslate $border * 2, 0;
		1341	$self->{label}->_draw;
		1342	}
		1343	}
		1344
		1345	#############################################################################
		1346
		1347	package CFPlus::UI::Toplevel;
		1348
		1349	our @ISA = CFPlus::UI::Bin::;
		1350
		1351	use CFPlus::OpenGL;
		1352
		1353	my $bg =
		1354	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1355	mipmap => 1, wrap => 1;
		1356
		1357	my @border =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1360
		1361	my @icon =
		1362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1363	qw(x1_move.png x1_resize.png);
		1364
		1365	sub new {
		1366	my ($class, %arg) = @_;
1017		1367
1018	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1369	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1370	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1371	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1372	can_events => 1,
1024	@_	1373	min_w => 64,
		1374	min_h => 32,
		1375	%arg,
1025	);	1376	);
1026		1377
1027	$self->{title} &&= new CFClient::UI::Label	1378	$self->{title_widget} = new CFPlus::UI::Label
1028	align => 0,	1379	align => 0,
1029	valign => 1,	1380	valign => 1,
1030	text => $self->{title},	1381	text => $self->{title},
1031	fontsize => $self->{border};	1382	fontsize => $self->{border},
		1383	if exists $self->{title};
		1384
		1385	if ($self->{has_close_button}) {
		1386	$self->{close_button} =
		1387	new CFPlus::UI::ImageButton
		1388	path => 'x1_close.png',
		1389	on_activate => sub { $self->emit ("delete") };
		1390
		1391	$self->CFPlus::UI::Container::add ($self->{close_button});
		1392	}
1032		1393
1033	$self	1394	$self
		1395	}
		1396
		1397	sub add {
		1398	my ($self, @widgets) = @_;
		1399
		1400	$self->SUPER::add (@widgets);
		1401	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1402	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034	}	1403	}
1035		1404
1036	sub border {	1405	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1406	int $_[0]{border} * $::FONTSIZE
1038	}	1407	}
1039		1408
1040	sub size_request {	1409	sub size_request {
1041	my ($self) = @_;	1410	my ($self) = @_;
		1411
		1412	$self->{title_widget}->size_request
		1413	if $self->{title_widget};
		1414
		1415	$self->{close_button}->size_request
		1416	if $self->{close_button};
1042		1417
1043	my ($w, $h) = $self->SUPER::size_request;	1418	my ($w, $h) = $self->SUPER::size_request;
1044		1419
1045	(	1420	(
1046	$w + $self->border * 2,	1421	$w + $self->border * 2,
1047	$h + $self->border * 2,	1422	$h + $self->border * 2,
1048	)	1423	)
1049	}	1424	}
1050		1425
1051	sub size_allocate {	1426	sub invoke_size_allocate {
1052	my ($self, $w, $h, $changed) = @_;	1427	my ($self, $w, $h) = @_;
1053		1428
1054	return unless $changed;	1429	if ($self->{title_widget}) {
		1430	$self->{title_widget}{w} = $w;
		1431	$self->{title_widget}{h} = $h;
		1432	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1433	}
1055		1434
		1435	my $border = $self->border;
		1436
1056	$h -= List::Util::max 0, $self->border * 2;	1437	$h -= List::Util::max 0, $border * 2;
1057	$w -= List::Util::max 0, $self->border * 2;	1438	$w -= List::Util::max 0, $border * 2;
1058		1439
1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060	if $self->{title};
1061
1062	$self->child->configure ($self->border, $self->border, $w, $h);	1440	$self->child->configure ($border, $border, $w, $h);
1063	}
1064		1441
		1442	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1443	if $self->{close_button};
		1444
		1445	1
		1446	}
		1447
		1448	sub invoke_delete {
		1449	my ($self) = @_;
		1450
		1451	$self->hide;
		1452
		1453	1
		1454	}
		1455
1065	sub button_down {	1456	sub invoke_button_down {
1066	my ($self, $ev, $x, $y) = @_;	1457	my ($self, $ev, $x, $y) = @_;
1067		1458
1068	my ($w, $h) = @$self{qw(w h)};	1459	my ($w, $h) = @$self{qw(w h)};
1069	my $border = $self->border;	1460	my $border = $self->border;
1070		1461
…		…
1083	my ($ev, $x, $y) = @_;	1474	my ($ev, $x, $y) = @_;
1084		1475
1085	my $dx = $ev->{x} - $ox;	1476	my $dx = $ev->{x} - $ox;
1086	my $dy = $ev->{y} - $oy;	1477	my $dy = $ev->{y} - $oy;
1087		1478
1088	$self->{user_x} = $wx + $dx * $mx;
1089	$self->{user_y} = $wy + $dy * $my;
1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1479	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1480	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092	$self->move ($self->{user_x}, $self->{user_y});	1481
		1482	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093	$self->realloc;	1483	$self->realloc;
1094	};	1484	};
1095		1485
1096	} elsif ($lr ^ $td) {	1486	} elsif ($lr ^ $td) {
1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1487	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1100	$self->{motion} = sub {	1490	$self->{motion} = sub {
1101	my ($ev, $x, $y) = @_;	1491	my ($ev, $x, $y) = @_;
1102		1492
1103	($x, $y) = ($ev->{x}, $ev->{y});	1493	($x, $y) = ($ev->{x}, $ev->{y});
1104		1494
1105	$self->{user_x} = $bx + $x - $ox;	1495	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106	$self->{user_y} = $by + $y - $oy;	1496	# HACK: the next line is required to enforce placement
1107		1497	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108	$self->move ($self->{user_x}, $self->{user_y});
1109	$self->realloc;
1110	};	1498	};
		1499	} else {
		1500	return 0;
		1501	}
		1502
1111	}	1503	1
1112	}	1504	}
1113		1505
1114	sub button_up {	1506	sub invoke_button_up {
1115	my ($self, $ev, $x, $y) = @_;	1507	my ($self, $ev, $x, $y) = @_;
1116		1508
1117	delete $self->{motion};	1509	! ! delete $self->{motion}
1118	}	1510	}
1119		1511
1120	sub mouse_motion {	1512	sub invoke_mouse_motion {
1121	my ($self, $ev, $x, $y) = @_;	1513	my ($self, $ev, $x, $y) = @_;
1122		1514
1123	$self->{motion}->($ev, $x, $y) if $self->{motion};	1515	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1516
		1517	! ! $self->{motion}
		1518	}
		1519
		1520	sub invoke_visibility_change {
		1521	my ($self, $visible) = @_;
		1522
		1523	delete $self->{motion} unless $visible;
		1524
		1525	0
1124	}	1526	}
1125		1527
1126	sub _draw {	1528	sub _draw {
1127	my ($self) = @_;	1529	my ($self) = @_;
1128		1530
		1531	my $child = $self->{children}[0];
		1532
1129	my ($w, $h ) = ($self->{w}, $self->{h});	1533	my ($w, $h ) = ($self->{w}, $self->{h});
1130	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1534	my ($cw, $ch) = ($child->{w}, $child->{h});
1131		1535
1132	glEnable GL_TEXTURE_2D;	1536	glEnable GL_TEXTURE_2D;
1133	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1537	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134		1538
1135	my $border = $self->border;	1539	my $border = $self->border;
1136		1540
1137	glColor @{ $self->{border_bg} };	1541	glColor @{ $self->{border_bg} };
1138	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1542	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1139	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1543	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1140	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1544	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1545	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1546
		1547	# move
		1548	my $w2 = ($w - $border) * .5;
		1549	my $h2 = ($h - $border) * .5;
		1550	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1553
		1554	# resize
		1555	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1556	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1557	unless $self->{has_close_button};
		1558	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1142		1560
1143	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1561	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144	my $bg = $tex[0];	1562	glColor @{ $self->{bg} };
1145		1563
1146	# TODO: repeat texture not scale	1564	# TODO: repeat texture not scale
		1565	# solve this better(?)
1147	my $rep_x = $cw / $bg->{w};	1566	$bg->{s} = $cw / $bg->{w};
1148	my $rep_y = $ch / $bg->{h};	1567	$bg->{t} = $ch / $bg->{h};
1149
1150	glColor @{ $self->{bg} };
1151
1152	$bg->{s} = $rep_x;
1153	$bg->{t} = $rep_y;
1154	$bg->{wrap_mode} = 1;
1155	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1568	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156	}	1569	}
1157		1570
1158	glDisable GL_TEXTURE_2D;	1571	glDisable GL_TEXTURE_2D;
1159		1572
1160	$self->{title}->draw if $self->{title};
1161
1162	$self->child->draw;	1573	$child->draw;
		1574
		1575	if ($self->{title_widget}) {
		1576	glTranslate 0, $border - $self->{h};
		1577	$self->{title_widget}->_draw;
		1578
		1579	glTranslate 0, - ($border - $self->{h});
		1580	}
		1581
		1582	$self->{close_button}->draw
		1583	if $self->{close_button};
1163	}	1584	}
1164		1585
1165	#############################################################################	1586	#############################################################################
1166		1587
1167	package CFClient::UI::Table;	1588	package CFPlus::UI::Table;
1168		1589
1169	our @ISA = CFClient::UI::Base::;	1590	our @ISA = CFPlus::UI::Container::;
1170		1591
1171	use List::Util qw(max sum);	1592	use List::Util qw(max sum);
1172		1593
1173	use CFClient::OpenGL;	1594	use CFPlus::OpenGL;
1174		1595
1175	sub new {	1596	sub new {
1176	my $class = shift;	1597	my $class = shift;
1177		1598
1178	$class->SUPER::new (	1599	$class->SUPER::new (
1179	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1180	@_,	1602	@_,
1181	)	1603	)
1182	}	1604	}
1183		1605
1184	sub children {
1185	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1186	}
1187
1188	sub add {	1606	sub add {
1189	my ($self, $x, $y, $child) = @_;
1190
1191	$child->set_parent ($self);
1192	$self->{children}[$y][$x] = $child;
1193
1194	$self->realloc;
1195	}
1196
1197	# TODO: move to container class maybe? send children a signal on removal?
1198	sub clear {
1199	my ($self) = @_;	1607	my ($self, @widgets) = @_;
		1608
		1609	for my $child (@widgets) {
		1610	$child->{rowspan} ||= 1;
		1611	$child->{colspan} ||= 1;
		1612	}
		1613
		1614	$self->SUPER::add (@widgets);
		1615	}
		1616
		1617	sub add_at {
		1618	my $self = shift;
		1619
		1620	my @widgets;
		1621
		1622	while (@_) {
		1623	my ($col, $row, $child) = splice @_, 0, 3, ();
		1624
		1625	$child->{row} = $row;
		1626	$child->{col} = $col;
		1627
		1628	push @widgets, $child;
		1629	}
		1630
		1631	$self->add (@widgets);
		1632	}
		1633
		1634	sub get_wh {
		1635	my ($self) = @_;
		1636
		1637	my (@w, @h);
1200		1638
1201	my @children = $self->children;	1639	my @children = $self->children;
1202	delete $self->{children};	1640
		1641	# first pass, columns
		1642	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1643	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1644
		1645	my $sw = sum @w[$c .. $c + $cs - 1];
		1646
		1647	if ($w > $sw) {
		1648	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1649	}
1203		1650	}
1204	for (@children) {
1205	delete $_->{parent};
1206	$_->hide;
1207	}
1208		1651
1209	$self->realloc;	1652	# second pass, rows
1210	}	1653	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1211
1212	sub get_wh {
1213	my ($self) = @_;
1214
1215	my (@w, @h);
1216
1217	for my $y (0 .. $#{$self->{children}}) {
1218	my $row = $self->{children}[$y]
1219	or next;
1220
1221	for my $x (0 .. $#$row) {
1222	my $widget = $row->[$x]
1223	or next;
1224	my ($w, $h) = @$widget{qw(req_w req_h)};	1654	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1225		1655
1226	$w[$x] = max $w[$x], $w;	1656	my $sh = sum @h[$r .. $r + $rs - 1];
1227	$h[$y] = max $h[$y], $h;	1657
		1658	if ($h > $sh) {
		1659	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1228	}	1660	}
1229	}	1661	}
1230		1662
1231	(\@w, \@h)	1663	(\@w, \@h)
1232	}	1664	}
…		…
1240	(sum @$ws),	1672	(sum @$ws),
1241	(sum @$hs),	1673	(sum @$hs),
1242	)	1674	)
1243	}	1675	}
1244		1676
1245	sub size_allocate {	1677	sub invoke_size_allocate {
1246	my ($self, $w, $h, $changed) = @_;	1678	my ($self, $w, $h) = @_;
1247		1679
1248	my ($ws, $hs) = $self->get_wh;	1680	my ($ws, $hs) = $self->get_wh;
1249		1681
1250	my $req_w = (sum @$ws) || 1;	1682	my $req_w = (sum @$ws) || 1;
1251	my $req_h = (sum @$hs) || 1;	1683	my $req_h = (sum @$hs) || 1;
1252		1684
1253	# TODO: nicer code && do row_expand	1685	# now linearly scale the rows/columns to the allocated size
1254	my @col_expand = @{$self->{col_expand}};	1686	my @col_expand = @{$self->{col_expand}};
1255	@col_expand = (1) x @$ws unless @col_expand;	1687	@col_expand = (1) x @$ws unless @col_expand;
1256	my $col_expand = (sum @col_expand) || 1;	1688	my $col_expand = (sum @col_expand) || 1;
1257		1689
1258	# linearly scale sizes
1259	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1690	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1260	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1261		1691
1262	CFClient::UI::harmonize $ws;	1692	CFPlus::UI::harmonize $ws;
		1693
		1694	my @row_expand = @{$self->{row_expand}};
		1695	@row_expand = (1) x @$ws unless @row_expand;
		1696	my $row_expand = (sum @row_expand) || 1;
		1697
		1698	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1699
1263	CFClient::UI::harmonize $hs;	1700	CFPlus::UI::harmonize $hs;
1264		1701
1265	my $y;	1702	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1703	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1266		1704
1267	for my $r (0 .. $#{$self->{children}}) {	1705	for my $widget ($self->children) {
1268	my $row = $self->{children}[$r]	1706	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1269	or next;
1270		1707
1271	my $x = 0;	1708	$widget->configure (
1272	my $row_h = $hs->[$r];	1709	$x[$c], $y[$r],
		1710	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1273		1711	);
1274	for my $c (0 .. $#$row) {	1712	}
1275	my $col_w = $ws->[$c];
1276		1713
1277	if (my $widget = $row->[$c]) {	1714	1
1278	$widget->configure ($x, $y, $col_w, $row_h);	1715	}
1279	}
1280		1716
1281	$x += $col_w;	1717	#############################################################################
		1718
		1719	package CFPlus::UI::Fixed;
		1720
		1721	use List::Util qw(min max);
		1722
		1723	our @ISA = CFPlus::UI::Container::;
		1724
		1725	sub add {
		1726	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1727
		1728	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1729	$self->SUPER::add ($child);
		1730	}
		1731
		1732	sub _scale($$$) {
		1733	my ($mode, $val, $max) = @_;
		1734
		1735	$mode eq "abs" ? $val
		1736	: $mode eq "rel" ? $val * $max
		1737	: 0
		1738	}
		1739
		1740	sub size_request {
		1741	my ($self) = @_;
		1742
		1743	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1744
		1745	# determine overall size by querying abs widgets
		1746	for my $child ($self->visible_children) {
		1747	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1748
		1749	if ($pos eq "abs") {
		1750	$w = _scale $size, $w, $child->{req_w};
		1751	$h = _scale $size, $h, $child->{req_h};
		1752
		1753	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1754	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1282	}	1755	}
1283
1284	$y += $row_h;
1285	}	1756	}
1286		1757
1287	}	1758	my $W = $x2 - $x1;
		1759	my $H = $y2 - $y1;
1288		1760
1289	sub find_widget {	1761	# now layout remaining widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos ne "abs") {
		1766	$x = _scale $pos, $x, $W;
		1767	$y = _scale $pos, $x, $H;
		1768	$w = _scale $size, $w, $child->{req_w};
		1769	$h = _scale $size, $h, $child->{req_h};
		1770
		1771	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1772	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1773	}
		1774	}
		1775
		1776	my $W = $x2 - $x1;
		1777	my $H = $y2 - $y1;
		1778
		1779	($W, $H)
		1780	}
		1781
		1782	sub invoke_size_allocate {
1290	my ($self, $x, $y) = @_;	1783	my ($self, $W, $H) = @_;
1291		1784
1292	$x -= $self->{x};	1785	for my $child ($self->visible_children) {
1293	$y -= $self->{y};	1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1294		1787
1295	my $res;	1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
1296		1792
1297	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1793	$child->configure ($x, $y, $w, $h);
1298	$res = $_->find_widget ($x, $y)	1794	}
1299	and return $res;	1795
1300	}	1796	1
1301
1302	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1303	}
1304
1305	sub _draw {
1306	my ($self) = @_;
1307
1308	for (grep $_, @{$self->{children}}) {
1309	$_->draw for grep $_, @$_;
1310	}
1311	}	1797	}
1312		1798
1313	#############################################################################	1799	#############################################################################
1314		1800
1315	package CFClient::UI::Box;	1801	package CFPlus::UI::Box;
1316		1802
1317	our @ISA = CFClient::UI::Container::;	1803	our @ISA = CFPlus::UI::Container::;
1318		1804
1319	sub size_request {	1805	sub size_request {
1320	my ($self) = @_;	1806	my ($self) = @_;
1321		1807
1322	$self->{vertical}	1808	$self->{vertical}
…		…
1328	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1814	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1815	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1330	)	1816	)
1331	}	1817	}
1332		1818
1333	sub size_allocate {	1819	sub invoke_size_allocate {
1334	my ($self, $w, $h, $changed) = @_;	1820	my ($self, $w, $h) = @_;
1335		1821
1336	my $space = $self->{vertical} ? $h : $w;	1822	my $space = $self->{vertical} ? $h : $w;
1337	my $children = $self->{children};	1823	my @children = $self->visible_children;
1338		1824
1339	my @req;	1825	my @req;
1340		1826
1341	if ($self->{homogeneous}) {	1827	if ($self->{homogeneous}) {
1342	@req = ($space / (@$children || 1)) x @$children;	1828	@req = ($space / (@children || 1)) x @children;
1343	} else {	1829	} else {
1344	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1830	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345	my $req = List::Util::sum @req;	1831	my $req = List::Util::sum @req;
1346		1832
1347	if ($req > $space) {	1833	if ($req > $space) {
1348	# ah well, not enough space	1834	# ah well, not enough space
1349	$_ *= $space / $req for @req;	1835	$_ *= $space / $req for @req;
1350	} else {	1836	} else {
1351	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1837	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352		1838
1353	$space = ($space - $req) / $expand; # remaining space to give away	1839	$space = ($space - $req) / $expand; # remaining space to give away
1354		1840
1355	$req[$_] += $space * $children->[$_]{expand}	1841	$req[$_] += $space * $children[$_]{expand}
1356	for 0 .. $#$children;	1842	for 0 .. $#children;
1357	}	1843	}
1358	}	1844	}
1359		1845
1360	CFClient::UI::harmonize \@req;	1846	CFPlus::UI::harmonize \@req;
1361		1847
1362	my $pos = 0;	1848	my $pos = 0;
1363	for (0 .. $#$children) {	1849	for (0 .. $#children) {
1364	my $alloc = $req[$_];	1850	my $alloc = $req[$_];
1365	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1851	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366		1852
1367	$pos += $alloc;	1853	$pos += $alloc;
1368	}	1854	}
1369		1855
1370	1	1856	1
1371	}	1857	}
1372		1858
1373	#############################################################################	1859	#############################################################################
1374		1860
1375	package CFClient::UI::HBox;	1861	package CFPlus::UI::HBox;
1376		1862
1377	our @ISA = CFClient::UI::Box::;	1863	our @ISA = CFPlus::UI::Box::;
1378		1864
1379	sub new {	1865	sub new {
1380	my $class = shift;	1866	my $class = shift;
1381		1867
1382	$class->SUPER::new (	1868	$class->SUPER::new (
…		…
1385	)	1871	)
1386	}	1872	}
1387		1873
1388	#############################################################################	1874	#############################################################################
1389		1875
1390	package CFClient::UI::VBox;	1876	package CFPlus::UI::VBox;
1391		1877
1392	our @ISA = CFClient::UI::Box::;	1878	our @ISA = CFPlus::UI::Box::;
1393		1879
1394	sub new {	1880	sub new {
1395	my $class = shift;	1881	my $class = shift;
1396		1882
1397	$class->SUPER::new (	1883	$class->SUPER::new (
…		…
1400	)	1886	)
1401	}	1887	}
1402		1888
1403	#############################################################################	1889	#############################################################################
1404		1890
1405	package CFClient::UI::Label;	1891	package CFPlus::UI::Label;
1406		1892
1407	our @ISA = CFClient::UI::DrawBG::;	1893	our @ISA = CFPlus::UI::DrawBG::;
1408		1894
1409	use CFClient::OpenGL;	1895	use CFPlus::OpenGL;
1410		1896
1411	sub new {	1897	sub new {
1412	my ($class, %arg) = @_;	1898	my ($class, %arg) = @_;
1413		1899
1414	my $self = $class->SUPER::new (	1900	my $self = $class->SUPER::new (
…		…
1417	#active_bg => none	1903	#active_bg => none
1418	#font => default_font	1904	#font => default_font
1419	#text => initial text	1905	#text => initial text
1420	#markup => initial narkup	1906	#markup => initial narkup
1421	#max_w => maximum pixel width	1907	#max_w => maximum pixel width
		1908	#style => 0, # render flags
1422	ellipsise => 3, # end	1909	ellipsise => 3, # end
1423	layout => (new CFClient::Layout),	1910	layout => (new CFPlus::Layout),
1424	fontsize => 1,	1911	fontsize => 1,
1425	align => -1,	1912	align => -1,
1426	valign => -1,	1913	valign => -1,
1427	padding => 2,	1914	padding_x => 2,
		1915	padding_y => 2,
1428	can_events => 0,	1916	can_events => 0,
1429	%arg	1917	%arg
1430	);	1918	);
1431		1919
1432	if (exists $self->{template}) {	1920	if (exists $self->{template}) {
1433	my $layout = new CFClient::Layout;	1921	my $layout = new CFPlus::Layout;
1434	$layout->set_text (delete $self->{template});	1922	$layout->set_text (delete $self->{template});
1435	$self->{template} = $layout;	1923	$self->{template} = $layout;
1436	}	1924	}
1437		1925
1438	if (exists $self->{markup}) {	1926	if (exists $self->{markup}) {
…		…
1442	}	1930	}
1443		1931
1444	$self	1932	$self
1445	}	1933	}
1446		1934
1447	sub escape($) {
1448	local $_ = $_[0];
1449
1450	s/&/&amp;/g;
1451	s/>/&gt;/g;
1452	s/</&lt;/g;
1453
1454	$_
1455	}
1456
1457	sub update {	1935	sub update {
1458	my ($self) = @_;	1936	my ($self) = @_;
1459		1937
1460	delete $self->{texture};	1938	delete $self->{texture};
1461	$self->SUPER::update;	1939	$self->SUPER::update;
1462	}	1940	}
1463		1941
		1942	sub realloc {
		1943	my ($self) = @_;
		1944
		1945	delete $self->{ox};
		1946	$self->SUPER::realloc;
		1947	}
		1948
1464	sub set_text {	1949	sub set_text {
1465	my ($self, $text) = @_;	1950	my ($self, $text) = @_;
1466		1951
1467	return if $self->{text} eq "T$text";	1952	return if $self->{text} eq "T$text";
1468	$self->{text} = "T$text";	1953	$self->{text} = "T$text";
1469		1954
1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471	$self->{layout}->set_text ($text);	1955	$self->{layout}->set_text ($text);
1472		1956
		1957	delete $self->{size_req};
1473	$self->realloc;	1958	$self->realloc;
		1959	$self->update;
1474	}	1960	}
1475		1961
1476	sub set_markup {	1962	sub set_markup {
1477	my ($self, $markup) = @_;	1963	my ($self, $markup) = @_;
1478		1964
1479	return if $self->{text} eq "M$markup";	1965	return if $self->{text} eq "M$markup";
1480	$self->{text} = "M$markup";	1966	$self->{text} = "M$markup";
1481		1967
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1968	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		1969
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1970	$self->{layout}->set_markup ($markup);
1486		1971
		1972	delete $self->{size_req};
1487	$self->realloc;	1973	$self->realloc;
		1974	$self->update;
1488	}	1975	}
1489		1976
1490	sub size_request {	1977	sub size_request {
1491	my ($self) = @_;	1978	my ($self) = @_;
1492		1979
		1980	$self->{size_req} ||= do {
1493	$self->{layout}->set_font ($self->{font}) if $self->{font};	1981	$self->{layout}->set_font ($self->{font}) if $self->{font};
1494	$self->{layout}->set_width ($self->{max_w} || -1);	1982	$self->{layout}->set_width ($self->{max_w} || -1);
1495	$self->{layout}->set_ellipsise ($self->{ellipsise});	1983	$self->{layout}->set_ellipsise ($self->{ellipsise});
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1984	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1985	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1986
1499	my ($w, $h) = $self->{layout}->size;	1987	my ($w, $h) = $self->{layout}->size;
1500		1988
1501	if (exists $self->{template}) {	1989	if (exists $self->{template}) {
1502	$self->{template}->set_font ($self->{font}) if $self->{font};	1990	$self->{template}->set_font ($self->{font}) if $self->{font};
		1991	$self->{template}->set_width ($self->{max_w} || -1);
1503	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1992	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504		1993
1505	my ($w2, $h2) = $self->{template}->size;	1994	my ($w2, $h2) = $self->{template}->size;
1506		1995
1507	$w = List::Util::max $w, $w2;	1996	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1997	$h = List::Util::max $h, $h2;
		1998	}
		1999
		2000	[$w, $h]
1509	}	2001	};
1510		2002
1511	(	2003	@{ $self->{size_req} }
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	2004	}
1516		2005
		2006	sub baseline_shift {
		2007	$_[0]{layout}->descent
		2008	}
		2009
1517	sub size_allocate {	2010	sub invoke_size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	2011	my ($self, $w, $h) = @_;
		2012
		2013	delete $self->{ox};
1519		2014
1520	delete $self->{texture}	2015	delete $self->{texture}
1521	if $changed;	2016	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2017
		2018	1
1522	}	2019	}
1523		2020
1524	sub set_fontsize {	2021	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	2022	my ($self, $fontsize) = @_;
1526		2023
1527	$self->{fontsize} = $fontsize;	2024	$self->{fontsize} = $fontsize;
		2025	delete $self->{size_req};
1528	delete $self->{texture};	2026	delete $self->{texture};
1529		2027
1530	$self->realloc;	2028	$self->realloc;
1531	}	2029	}
1532		2030
		2031	sub reconfigure {
		2032	my ($self) = @_;
		2033
		2034	delete $self->{size_req};
		2035	delete $self->{texture};
		2036
		2037	$self->SUPER::reconfigure;
		2038	}
		2039
1533	sub _draw {	2040	sub _draw {
1534	my ($self) = @_;	2041	my ($self) = @_;
1535		2042
1536	$self->SUPER::_draw; # draw background, if applicable	2043	$self->SUPER::_draw; # draw background, if applicable
1537		2044
1538	my $tex = $self->{texture} ||= do {	2045	my $size = $self->{texture} ||= do {
1539	$self->{layout}->set_foreground (@{$self->{fg}});	2046	$self->{layout}->set_foreground (@{$self->{fg}});
1540	$self->{layout}->set_font ($self->{font}) if $self->{font};	2047	$self->{layout}->set_font ($self->{font}) if $self->{font};
1541	$self->{layout}->set_width ($self->{w});	2048	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	2049	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2050	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2051	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		2052
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	2053	[$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	};	2054	};
1558		2055
1559	glEnable GL_TEXTURE_2D;	2056	unless (exists $self->{ox}) {
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2057	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		2058	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		2059	: ($self->{w} - $size->[0]) * 0.5);
1561		2060
1562	if ($tex->{format} == GL_ALPHA) {	2061	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563	glColor @{$self->{fg}};	2062	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	2063	: ($self->{h} - $size->[1]) * 0.5);
1565	} else {
1566	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567	}	2064	};
1568		2065
1569	glDisable GL_TEXTURE_2D;	2066	my $w = List::Util::min $self->{w} + 4, $size->[0];
		2067	my $h = List::Util::min $self->{h} + 2, $size->[1];
		2068
		2069	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1570	}	2070	}
1571		2071
1572	#############################################################################	2072	#############################################################################
1573		2073
1574	package CFClient::UI::EntryBase;	2074	package CFPlus::UI::EntryBase;
1575		2075
1576	our @ISA = CFClient::UI::Label::;	2076	our @ISA = CFPlus::UI::Label::;
1577		2077
1578	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1579		2079
1580	sub new {	2080	sub new {
1581	my $class = shift;	2081	my $class = shift;
1582		2082
1583	$class->SUPER::new (	2083	$class->SUPER::new (
…		…
1587	active_fg => [0, 0, 0],	2087	active_fg => [0, 0, 0],
1588	can_hover => 1,	2088	can_hover => 1,
1589	can_focus => 1,	2089	can_focus => 1,
1590	valign => 0,	2090	valign => 0,
1591	can_events => 1,	2091	can_events => 1,
		2092	ellipsise => 0,
1592	#text => ...	2093	#text => ...
		2094	#hidden => "*",
1593	@_	2095	@_
1594	)	2096	)
1595	}	2097	}
1596		2098
1597	sub _set_text {	2099	sub _set_text {
…		…
1599		2101
1600	delete $self->{cur_h};	2102	delete $self->{cur_h};
1601		2103
1602	return if $self->{text} eq $text;	2104	return if $self->{text} eq $text;
1603		2105
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	2106	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	2107	$self->{text} = $text;
1608		2108
1609	$text =~ s/./*/g if $self->{hidden};	2109	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	2110	$self->{layout}->set_text ("$text ");
		2111	delete $self->{size_req};
1611		2112
1612	$self->_emit (changed => $self->{text});	2113	$self->emit (changed => $self->{text});
		2114
		2115	$self->realloc;
		2116	$self->update;
1613	}	2117	}
1614		2118
1615	sub set_text {	2119	sub set_text {
1616	my ($self, $text) = @_;	2120	my ($self, $text) = @_;
1617		2121
1618	$self->{cursor} = length $text;	2122	$self->{cursor} = length $text;
1619	$self->_set_text ($text);	2123	$self->_set_text ($text);
1620
1621	$self->realloc;
1622	}	2124	}
1623		2125
1624	sub get_text {	2126	sub get_text {
1625	$_[0]{text}	2127	$_[0]{text}
1626	}	2128	}
…		…
1631	my ($w, $h) = $self->SUPER::size_request;	2133	my ($w, $h) = $self->SUPER::size_request;
1632		2134
1633	($w + 1, $h) # add 1 for cursor	2135	($w + 1, $h) # add 1 for cursor
1634	}	2136	}
1635		2137
1636	sub key_down {	2138	sub invoke_key_down {
1637	my ($self, $ev) = @_;	2139	my ($self, $ev) = @_;
1638		2140
1639	my $mod = $ev->{mod};	2141	my $mod = $ev->{mod};
1640	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1641	my $uni = $ev->{unicode};	2143	my $uni = $ev->{unicode};
1642		2144
1643	my $text = $self->get_text;	2145	my $text = $self->get_text;
		2146
		2147	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1644		2148
1645	if ($uni == 8) {	2149	if ($uni == 8) {
1646	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2150	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1647	} elsif ($uni == 127) {	2151	} elsif ($uni == 127) {
1648	substr $text, $self->{cursor}, 1, "";	2152	substr $text, $self->{cursor}, 1, "";
1649	} elsif ($sym == CFClient::SDLK_LEFT) {	2153	} elsif ($sym == CFPlus::SDLK_LEFT) {
1650	--$self->{cursor} if $self->{cursor};	2154	--$self->{cursor} if $self->{cursor};
1651	} elsif ($sym == CFClient::SDLK_RIGHT) {	2155	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1652	++$self->{cursor} if $self->{cursor} < length $self->{text};	2156	++$self->{cursor} if $self->{cursor} < length $self->{text};
1653	} elsif ($sym == CFClient::SDLK_HOME) {	2157	} elsif ($sym == CFPlus::SDLK_HOME) {
		2158	# what a hack
		2159	$self->{cursor} =
		2160	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2161	? length $1
		2162	: 0;
		2163	} elsif ($sym == CFPlus::SDLK_END) {
		2164	# uh, again
		2165	$self->{cursor} =
		2166	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2167	? $self->{cursor} + length $1
		2168	: length $self->{text};
		2169	} elsif ($uni == 21) { # ctrl-u
		2170	$text = "";
1654	$self->{cursor} = 0;	2171	$self->{cursor} = 0;
1655	} elsif ($sym == CFClient::SDLK_END) {
1656	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	2172	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	2173	$self->emit ('escape');
1659	} elsif ($uni) {	2174	} elsif ($uni == 0x0d) {
		2175	substr $text, $self->{cursor}++, 0, "\012";
		2176	} elsif ($uni >= 0x20) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	2177	substr $text, $self->{cursor}++, 0, chr $uni;
		2178	} else {
		2179	return 0;
1661	}	2180	}
1662		2181
1663	$self->_set_text ($text);	2182	$self->_set_text ($text);
1664		2183
1665	$self->realloc;	2184	$self->realloc;
1666	}	2185	$self->update;
1667		2186
		2187	1
		2188	}
		2189
1668	sub focus_in {	2190	sub invoke_focus_in {
1669	my ($self) = @_;	2191	my ($self) = @_;
1670		2192
1671	$self->{last_activity} = $::NOW;	2193	$self->{last_activity} = $::NOW;
1672		2194
1673	$self->SUPER::focus_in;	2195	$self->SUPER::invoke_focus_in
1674	}	2196	}
1675		2197
1676	sub button_down {	2198	sub invoke_button_down {
1677	my ($self, $ev, $x, $y) = @_;	2199	my ($self, $ev, $x, $y) = @_;
1678		2200
1679	$self->SUPER::button_down ($ev, $x, $y);	2201	$self->SUPER::invoke_button_down ($ev, $x, $y);
1680		2202
1681	my $idx = $self->{layout}->xy_to_index ($x, $y);	2203	my $idx = $self->{layout}->xy_to_index ($x, $y);
1682		2204
1683	# byte-index to char-index	2205	# byte-index to char-index
1684	my $text = $self->{text};	2206	my $text = $self->{text};
1685	utf8::encode $text;	2207	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	2208	$self->{cursor} = length $text;
1687		2209
1688	$self->_set_text ($self->{text});	2210	$self->_set_text ($self->{text});
1689	$self->update;	2211	$self->update;
		2212
		2213	1
1690	}	2214	}
1691		2215
1692	sub mouse_motion {	2216	sub invoke_mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	2217	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2218	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2219
		2220	1
1695	}	2221	}
1696		2222
1697	sub _draw {	2223	sub _draw {
1698	my ($self) = @_;	2224	my ($self) = @_;
1699		2225
1700	local $self->{fg} = $self->{fg};	2226	local $self->{fg} = $self->{fg};
1701		2227
1702	if ($FOCUS == $self) {	2228	if ($FOCUS == $self) {
1703	glColor @{$self->{active_bg}};	2229	glColor_premultiply @{$self->{active_bg}};
1704	$self->{fg} = $self->{active_fg};	2230	$self->{fg} = $self->{active_fg};
1705	} else {	2231	} else {
1706	glColor @{$self->{bg}};	2232	glColor_premultiply @{$self->{bg}};
1707	}	2233	}
1708		2234
1709	glEnable GL_BLEND;	2235	glEnable GL_BLEND;
1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2236	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711	glBegin GL_QUADS;	2237	glBegin GL_QUADS;
1712	glVertex 0 , 0;	2238	glVertex 0 , 0;
1713	glVertex 0 , $self->{h};	2239	glVertex 0 , $self->{h};
1714	glVertex $self->{w}, $self->{h};	2240	glVertex $self->{w}, $self->{h};
1715	glVertex $self->{w}, 0;	2241	glVertex $self->{w}, 0;
…		…
1726	utf8::encode $text;	2252	utf8::encode $text;
1727		2253
1728	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1729	}	2255	}
1730		2256
1731	glColor @{$self->{fg}};
1732	glBegin GL_LINES;	2257	glBegin GL_LINES;
1733	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1734	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1735	glEnd;	2260	glEnd;
1736	}	2261	}
1737	}	2262	}
1738		2263
		2264	#############################################################################
		2265
1739	package CFClient::UI::Entry;	2266	package CFPlus::UI::Entry;
1740		2267
1741	our @ISA = CFClient::UI::EntryBase::;	2268	our @ISA = CFPlus::UI::EntryBase::;
1742		2269
1743	use CFClient::OpenGL;	2270	use CFPlus::OpenGL;
1744		2271
1745	sub key_down {	2272	sub invoke_key_down {
1746	my ($self, $ev) = @_;	2273	my ($self, $ev) = @_;
1747		2274
1748	my $sym = $ev->{sym};	2275	my $sym = $ev->{sym};
1749		2276
1750	if ($sym == 13) {	2277	if ($ev->{uni} == 0x0d || $sym == 13) {
1751	unshift @{$self->{history}},	2278	unshift @{$self->{history}},
1752	my $txt = $self->get_text;	2279	my $txt = $self->get_text;
		2280
1753	$self->{history_pointer} = -1;	2281	$self->{history_pointer} = -1;
1754	$self->{history_saveback} = '';	2282	$self->{history_saveback} = '';
1755	$self->_emit (activate => $txt);	2283	$self->emit (activate => $txt);
1756	$self->update;	2284	$self->update;
1757		2285
1758	} elsif ($sym == CFClient::SDLK_UP) {	2286	} elsif ($sym == CFPlus::SDLK_UP) {
1759	if ($self->{history_pointer} < 0) {	2287	if ($self->{history_pointer} < 0) {
1760	$self->{history_saveback} = $self->get_text;	2288	$self->{history_saveback} = $self->get_text;
1761	}	2289	}
1762	if (@{$self->{history} || []} > 0) {	2290	if (@{$self->{history} || []} > 0) {
1763	$self->{history_pointer}++;	2291	$self->{history_pointer}++;
…		…
1765	$self->{history_pointer} = @{$self->{history} || []} - 1;	2293	$self->{history_pointer} = @{$self->{history} || []} - 1;
1766	}	2294	}
1767	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2295	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1768	}	2296	}
1769		2297
1770	} elsif ($sym == CFClient::SDLK_DOWN) {	2298	} elsif ($sym == CFPlus::SDLK_DOWN) {
1771	$self->{history_pointer}--;	2299	$self->{history_pointer}--;
1772	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2300	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1773		2301
1774	if ($self->{history_pointer} >= 0) {	2302	if ($self->{history_pointer} >= 0) {
1775	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2303	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1776	} else {	2304	} else {
1777	$self->set_text ($self->{history_saveback});	2305	$self->set_text ($self->{history_saveback});
1778	}	2306	}
1779		2307
1780	} else {	2308	} else {
1781	$self->SUPER::key_down ($ev);	2309	return $self->SUPER::invoke_key_down ($ev)
		2310	}
		2311
1782	}	2312	1
1783
1784	}	2313	}
1785		2314
1786	#############################################################################	2315	#############################################################################
1787		2316
		2317	package CFPlus::UI::TextEdit;
		2318
		2319	our @ISA = CFPlus::UI::EntryBase::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	sub move_cursor_ver {
		2324	my ($self, $dy) = @_;
		2325
		2326	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2327
		2328	$y += $dy;
		2329
		2330	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2331	$self->{cursor} = $index;
		2332	delete $self->{cur_h};
		2333	$self->update;
		2334	return;
		2335	}
		2336	}
		2337
		2338	sub invoke_key_down {
		2339	my ($self, $ev) = @_;
		2340
		2341	my $sym = $ev->{sym};
		2342
		2343	if ($sym == CFPlus::SDLK_UP) {
		2344	$self->move_cursor_ver (-1);
		2345	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2346	$self->move_cursor_ver (+1);
		2347	} else {
		2348	return $self->SUPER::invoke_key_down ($ev)
		2349	}
		2350
		2351	1
		2352	}
		2353
		2354	#############################################################################
		2355
1788	package CFClient::UI::Button;	2356	package CFPlus::UI::Button;
1789		2357
1790	our @ISA = CFClient::UI::Label::;	2358	our @ISA = CFPlus::UI::Label::;
1791		2359
1792	use CFClient::OpenGL;	2360	use CFPlus::OpenGL;
1793		2361
1794	my @tex =	2362	my @tex =
1795	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1796	qw(b1_button_active.png);	2364	qw(b1_button_inactive.png b1_button_active.png);
1797		2365
1798	sub new {	2366	sub new {
1799	my $class = shift;	2367	my $class = shift;
1800		2368
1801	$class->SUPER::new (	2369	$class->SUPER::new (
1802	padding => 4,	2370	padding_x => 4,
		2371	padding_y => 4,
1803	fg => [1, 1, 1],	2372	fg => [1.0, 1.0, 1.0],
1804	active_fg => [0, 0, 1],	2373	active_fg => [0.8, 0.8, 0.8],
1805	can_hover => 1,	2374	can_hover => 1,
1806	align => 0,	2375	align => 0,
1807	valign => 0,	2376	valign => 0,
1808	can_events => 1,	2377	can_events => 1,
1809	@_	2378	@_
1810	)	2379	)
1811	}	2380	}
1812		2381
1813	sub activate { }
1814
1815	sub button_up {	2382	sub invoke_button_up {
1816	my ($self, $ev, $x, $y) = @_;	2383	my ($self, $ev, $x, $y) = @_;
1817		2384
1818	$self->emit ("activate")	2385	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	2386	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	2387	&& $y >= 0 && $y < $self->{h};
		2388
		2389	1
1821	}	2390	}
1822		2391
1823	sub _draw {	2392	sub _draw {
1824	my ($self) = @_;	2393	my ($self) = @_;
1825		2394
1826	local $self->{fg} = $self->{fg};	2395	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828	if ($GRAB == $self) {
1829	$self->{fg} = $self->{active_fg};
1830	}
1831		2396
1832	glEnable GL_TEXTURE_2D;	2397	glEnable GL_TEXTURE_2D;
1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2398	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834	glColor 0, 0, 0, 1;	2399	glColor 0, 0, 0, 1;
1835		2400
		2401	my $tex = $tex[$GRAB == $self];
1836	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2402	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1837		2403
1838	glDisable GL_TEXTURE_2D;	2404	glDisable GL_TEXTURE_2D;
1839		2405
1840	$self->SUPER::_draw;	2406	$self->SUPER::_draw;
1841	}	2407	}
1842		2408
1843	#############################################################################	2409	#############################################################################
1844		2410
1845	package CFClient::UI::CheckBox;	2411	package CFPlus::UI::CheckBox;
1846		2412
1847	our @ISA = CFClient::UI::DrawBG::;	2413	our @ISA = CFPlus::UI::DrawBG::;
1848		2414
1849	my @tex =	2415	my @tex =
1850	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2416	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1851	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2417	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1852		2418
1853	use CFClient::OpenGL;	2419	use CFPlus::OpenGL;
1854		2420
1855	sub new {	2421	sub new {
1856	my $class = shift;	2422	my $class = shift;
1857		2423
1858	$class->SUPER::new (	2424	$class->SUPER::new (
1859	padding => 2,	2425	padding_x => 2,
		2426	padding_y => 2,
1860	fg => [1, 1, 1],	2427	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	2428	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	2429	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	2430	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	2431	state => 0,
…		…
1868	}	2435	}
1869		2436
1870	sub size_request {	2437	sub size_request {
1871	my ($self) = @_;	2438	my ($self) = @_;
1872		2439
1873	($self->{padding} * 2 + 6) x 2	2440	(6) x 2
1874	}	2441	}
1875		2442
		2443	sub toggle {
		2444	my ($self) = @_;
		2445
		2446	$self->{state} = !$self->{state};
		2447	$self->emit (changed => $self->{state});
		2448	$self->update;
		2449	}
		2450
1876	sub button_down {	2451	sub invoke_button_down {
1877	my ($self, $ev, $x, $y) = @_;	2452	my ($self, $ev, $x, $y) = @_;
1878		2453
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2454	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2455	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	2456	$self->toggle;
1882	$self->_emit (changed => $self->{state});	2457	} else {
		2458	return 0
		2459	}
		2460
1883	}	2461	1
1884	}	2462	}
1885		2463
1886	sub _draw {	2464	sub _draw {
1887	my ($self) = @_;	2465	my ($self) = @_;
1888		2466
1889	$self->SUPER::_draw;	2467	$self->SUPER::_draw;
1890		2468
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2469	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		2470
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2471	my ($w, $h) = @$self{qw(w h)};
		2472
		2473	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		2474
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2475	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		2476
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	2477	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		2478
…		…
1901	glDisable GL_TEXTURE_2D;	2481	glDisable GL_TEXTURE_2D;
1902	}	2482	}
1903		2483
1904	#############################################################################	2484	#############################################################################
1905		2485
1906	package CFClient::UI::Image;	2486	package CFPlus::UI::Image;
1907		2487
1908	our @ISA = CFClient::UI::Base::;	2488	our @ISA = CFPlus::UI::Base::;
1909		2489
1910	use CFClient::OpenGL;	2490	use CFPlus::OpenGL;
1911	use Carp qw/confess/;
1912		2491
1913	our %loaded_images;	2492	our %texture_cache;
1914		2493
1915	sub new {	2494	sub new {
1916	my $class = shift;	2495	my $class = shift;
1917		2496
1918	my $self = $class->SUPER::new (can_events => 0, @_);	2497	my $self = $class->SUPER::new (
		2498	can_events => 0,
		2499	@_,
		2500	);
1919		2501
1920	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2502	$self->{path} || $self->{tex}
		2503	or Carp::croak "'path' or 'tex' attributes required";
1921		2504
1922	$loaded_images{$self->{image}} ||=	2505	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1923	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2506	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1924		2507
1925	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2508	CFPlus::weaken $texture_cache{$self->{path}};
1926		2509
1927	Scalar::Util::weaken $loaded_images{$self->{image}};	2510	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929	$self->{aspect} = $tex->{w} / $tex->{h};
1930		2511
1931	$self	2512	$self
1932	}	2513	}
1933		2514
		2515	sub STORABLE_freeze {
		2516	my ($self, $cloning) = @_;
		2517
		2518	$self->{path}
		2519	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2520
		2521	$self->{path}
		2522	}
		2523
		2524	sub STORABLE_attach {
		2525	my ($self, $cloning, $path) = @_;
		2526
		2527	$self->new (path => $path)
		2528	}
		2529
1934	sub size_request {	2530	sub size_request {
1935	my ($self) = @_;	2531	my ($self) = @_;
1936		2532
1937	($self->{tex}->{w}, $self->{tex}->{h})	2533	($self->{tex}{w}, $self->{tex}{h})
1938	}	2534	}
1939		2535
1940	sub _draw {	2536	sub _draw {
1941	my ($self) = @_;	2537	my ($self) = @_;
1942		2538
…		…
1952	}	2548	}
1953		2549
1954	glEnable GL_TEXTURE_2D;	2550	glEnable GL_TEXTURE_2D;
1955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1956		2552
1957	$tex->draw_quad_alpha (0, 0, $w, $h);	2553	$tex->draw_quad (0, 0, $w, $h);
1958		2554
1959	glDisable GL_TEXTURE_2D;	2555	glDisable GL_TEXTURE_2D;
1960	}	2556	}
1961		2557
1962	#############################################################################	2558	#############################################################################
1963		2559
		2560	package CFPlus::UI::ImageButton;
		2561
		2562	our @ISA = CFPlus::UI::Image::;
		2563
		2564	use CFPlus::OpenGL;
		2565
		2566	my %textures;
		2567
		2568	sub new {
		2569	my $class = shift;
		2570
		2571	my $self = $class->SUPER::new (
		2572	padding_x => 4,
		2573	padding_y => 4,
		2574	fg => [1, 1, 1],
		2575	active_fg => [0, 0, 1],
		2576	can_hover => 1,
		2577	align => 0,
		2578	valign => 0,
		2579	can_events => 1,
		2580	@_
		2581	);
		2582	}
		2583
		2584	sub invoke_button_up {
		2585	my ($self, $ev, $x, $y) = @_;
		2586
		2587	$self->emit ("activate")
		2588	if $x >= 0 && $x < $self->{w}
		2589	&& $y >= 0 && $y < $self->{h};
		2590
		2591	1
		2592	}
		2593
		2594	#############################################################################
		2595
1964	package CFClient::UI::VGauge;	2596	package CFPlus::UI::VGauge;
1965		2597
1966	our @ISA = CFClient::UI::Base::;	2598	our @ISA = CFPlus::UI::Base::;
1967		2599
1968	use List::Util qw(min max);	2600	use List::Util qw(min max);
1969		2601
1970	use CFClient::OpenGL;	2602	use CFPlus::OpenGL;
1971		2603
1972	my %tex = (	2604	my %tex = (
1973	food => [	2605	food => [
1974	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1975	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2607	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1976	],	2608	],
1977	grace => [	2609	grace => [
1978	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1979	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2611	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1980	],	2612	],
1981	hp => [	2613	hp => [
1982	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2615	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1984	],	2616	],
1985	mana => [	2617	mana => [
1986	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2619	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1988	],	2620	],
1989	);	2621	);
1990		2622
1991	# eg. VGauge->new (gauge => 'food'), default gauge: food	2623	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2051	my $ycut1 = max 0, min 1, $ycut;	2683	my $ycut1 = max 0, min 1, $ycut;
2052	my $ycut2 = max 0, min 1, $ycut - 1;	2684	my $ycut2 = max 0, min 1, $ycut - 1;
2053		2685
2054	my $h1 = $self->{h} * (1 - $ycut1);	2686	my $h1 = $self->{h} * (1 - $ycut1);
2055	my $h2 = $self->{h} * (1 - $ycut2);	2687	my $h2 = $self->{h} * (1 - $ycut2);
		2688	my $h3 = $self->{h};
		2689
		2690	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056		2691
2057	glEnable GL_BLEND;	2692	glEnable GL_BLEND;
2058	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2693	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2694	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2060	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061		2697
2062	glBindTexture GL_TEXTURE_2D, $t1->{name};	2698	glBindTexture GL_TEXTURE_2D, $t1->{name};
2063	glBegin GL_QUADS;	2699	glBegin GL_QUADS;
…		…
2078		2714
2079	if ($t3) {	2715	if ($t3) {
2080	glBindTexture GL_TEXTURE_2D, $t3->{name};	2716	glBindTexture GL_TEXTURE_2D, $t3->{name};
2081	glBegin GL_QUADS;	2717	glBegin GL_QUADS;
2082	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2718	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2719	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2720	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2721	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086	glEnd;	2722	glEnd;
2087	}	2723	}
2088		2724
2089	glDisable GL_BLEND;	2725	glDisable GL_BLEND;
2090	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2091	}	2727	}
2092		2728
2093	#############################################################################	2729	#############################################################################
2094		2730
2095	package CFClient::UI::Gauge;	2731	package CFPlus::UI::Gauge;
2096		2732
2097	our @ISA = CFClient::UI::VBox::;	2733	our @ISA = CFPlus::UI::VBox::;
2098		2734
2099	sub new {	2735	sub new {
2100	my ($class, %arg) = @_;	2736	my ($class, %arg) = @_;
2101		2737
2102	my $self = $class->SUPER::new (	2738	my $self = $class->SUPER::new (
…		…
2104	can_hover => 1,	2740	can_hover => 1,
2105	can_events => 1,	2741	can_events => 1,
2106	%arg,	2742	%arg,
2107	);	2743	);
2108		2744
2109	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2745	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2110	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2746	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2111	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2747	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2112		2748
2113	$self	2749	$self
2114	}	2750	}
2115		2751
2116	sub set_fontsize {	2752	sub set_fontsize {
…		…
2137	$self->{value}->set_text ($val);	2773	$self->{value}->set_text ($val);
2138	}	2774	}
2139		2775
2140	#############################################################################	2776	#############################################################################
2141		2777
2142	package CFClient::UI::Slider;	2778	package CFPlus::UI::Slider;
2143		2779
2144	use strict;	2780	use strict;
2145		2781
2146	use CFClient::OpenGL;	2782	use CFPlus::OpenGL;
2147		2783
2148	our @ISA = CFClient::UI::DrawBG::;	2784	our @ISA = CFPlus::UI::DrawBG::;
2149		2785
2150	my @tex =	2786	my @tex =
2151	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2787	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2152	qw(s1_slider.png s1_slider_bg.png);	2788	qw(s1_slider.png s1_slider_bg.png);
2153		2789
2154	sub new {	2790	sub new {
2155	my $class = shift;	2791	my $class = shift;
2156		2792
…		…
2163	fg => [1, 1, 1],	2799	fg => [1, 1, 1],
2164	active_fg => [0, 0, 0],	2800	active_fg => [0, 0, 0],
2165	bg => [0, 0, 0, 0.2],	2801	bg => [0, 0, 0, 0.2],
2166	active_bg => [1, 1, 1, 0.5],	2802	active_bg => [1, 1, 1, 0.5],
2167	range => [0, 0, 100, 10, 0],	2803	range => [0, 0, 100, 10, 0],
2168	req_w => $::WIDTH / 80,	2804	min_w => $::WIDTH / 80,
2169	req_h => $::WIDTH / 80,	2805	min_h => $::WIDTH / 80,
2170	vertical => 0,	2806	vertical => 0,
2171	can_hover => 1,	2807	can_hover => 1,
2172	inner_pad => 0.02,	2808	inner_pad => 0.02,
2173	@_	2809	@_
2174	);	2810	);
…		…
2177	$self->update;	2813	$self->update;
2178		2814
2179	$self	2815	$self
2180	}	2816	}
2181		2817
2182	sub changed { }
2183
2184	sub set_range {	2818	sub set_range {
2185	my ($self, $range) = @_;	2819	my ($self, $range) = @_;
2186		2820
2187	($range, $self->{range}) = ($self->{range}, $range);	2821	($range, $self->{range}) = ($self->{range}, $range);
2188		2822
2189	$self->update
2190	if "@$range" ne "@{$self->{range}}";	2823	if ("@$range" ne "@{$self->{range}}") {
		2824	$self->update;
		2825	$self->set_value ($self->{range}[0]);
		2826	}
2191	}	2827	}
2192		2828
2193	sub set_value {	2829	sub set_value {
2194	my ($self, $value) = @_;	2830	my ($self, $value) = @_;
2195		2831
…		…
2206	if $unit;	2842	if $unit;
2207		2843
2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2844	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209		2845
2210	if ($value != $old_value) {	2846	if ($value != $old_value) {
2211	$self->_emit (changed => $value);	2847	$self->emit (changed => $value);
2212	$self->update;	2848	$self->update;
2213	}	2849	}
2214	}	2850	}
2215		2851
2216	sub size_request {	2852	sub size_request {
2217	my ($self) = @_;	2853	my ($self) = @_;
2218		2854
2219	my $w = $self->{req_w};	2855	($self->{req_w}, $self->{req_h})
2220	my $h = $self->{req_h};
2221
2222	$self->{vertical} ? ($h, $w) : ($w, $h)
2223	}	2856	}
2224		2857
2225	sub button_down {	2858	sub invoke_button_down {
2226	my ($self, $ev, $x, $y) = @_;	2859	my ($self, $ev, $x, $y) = @_;
2227		2860
2228	$self->SUPER::button_down ($ev, $x, $y);	2861	$self->SUPER::invoke_button_down ($ev, $x, $y);
2229		2862
2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2863	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231		2864
2232	$self->mouse_motion ($ev, $x, $y);	2865	$self->invoke_mouse_motion ($ev, $x, $y)
2233	}	2866	}
2234		2867
2235	sub mouse_motion {	2868	sub invoke_mouse_motion {
2236	my ($self, $ev, $x, $y) = @_;	2869	my ($self, $ev, $x, $y) = @_;
2237		2870
2238	if ($GRAB == $self) {	2871	if ($GRAB == $self) {
2239	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2872	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240		2873
2241	my (undef, $lo, $hi, $page) = @{$self->{range}};	2874	my (undef, $lo, $hi, $page) = @{$self->{range}};
2242		2875
2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2876	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244		2877
2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2878	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2879	} else {
		2880	return 0;
		2881	}
		2882
2246	}	2883	1
		2884	}
		2885
		2886	sub invoke_mouse_wheel {
		2887	my ($self, $ev) = @_;
		2888
		2889	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2890
		2891	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2892
		2893	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2894
		2895	! ! $delta
2247	}	2896	}
2248		2897
2249	sub update {	2898	sub update {
2250	my ($self) = @_;	2899	my ($self) = @_;
2251		2900
2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2901	delete $self->{knob_w};
		2902	$self->SUPER::update;
		2903	}
		2904
		2905	sub _draw {
		2906	my ($self) = @_;
		2907
		2908	unless ($self->{knob_w}) {
2253	$self->set_value ($self->{range}[0]);	2909	$self->set_value ($self->{range}[0]);
2254		2910
2255	my ($value, $lo, $hi, $page) = @{$self->{range}};	2911	my ($value, $lo, $hi, $page) = @{$self->{range}};
2256	my $range = ($hi - $page - $lo) || 1e-100;	2912	my $range = ($hi - $page - $lo) || 1e-100;
2257		2913
…		…
2263	$value = ($value - $lo) / $range;	2919	$value = ($value - $lo) / $range;
2264	$value = $value * $self->{scale} + $self->{offset};	2920	$value = $value * $self->{scale} + $self->{offset};
2265		2921
2266	$self->{knob_x} = $value - $knob_w * 0.5;	2922	$self->{knob_x} = $value - $knob_w * 0.5;
2267	$self->{knob_w} = $knob_w;	2923	$self->{knob_w} = $knob_w;
2268	});	2924	}
2269
2270	$self->SUPER::update;
2271	}
2272
2273	sub _draw {
2274	my ($self) = @_;
2275		2925
2276	$self->SUPER::_draw ();	2926	$self->SUPER::_draw ();
2277		2927
2278	glScale $self->{w}, $self->{h};	2928	glScale $self->{w}, $self->{h};
2279		2929
…		…
2299	glDisable GL_TEXTURE_2D;	2949	glDisable GL_TEXTURE_2D;
2300	}	2950	}
2301		2951
2302	#############################################################################	2952	#############################################################################
2303		2953
2304	package CFClient::UI::ValSlider;	2954	package CFPlus::UI::ValSlider;
2305		2955
2306	our @ISA = CFClient::UI::HBox::;	2956	our @ISA = CFPlus::UI::HBox::;
2307		2957
2308	sub new {	2958	sub new {
2309	my ($class, %arg) = @_;	2959	my ($class, %arg) = @_;
2310		2960
2311	my $range = delete $arg{range};	2961	my $range = delete $arg{range};
2312		2962
2313	my $self = $class->SUPER::new (	2963	my $self = $class->SUPER::new (
2314	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2964	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2315	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2965	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2316	to_value => sub { shift },	2966	to_value => sub { shift },
2317	from_value => sub { shift },	2967	from_value => sub { shift },
2318	%arg,	2968	%arg,
2319	);	2969	);
2320		2970
…		…
2340	sub set_range { shift->{slider}->set_range (@_) }	2990	sub set_range { shift->{slider}->set_range (@_) }
2341	sub set_value { shift->{slider}->set_value (@_) }	2991	sub set_value { shift->{slider}->set_value (@_) }
2342		2992
2343	#############################################################################	2993	#############################################################################
2344		2994
2345	package CFClient::UI::TextView;	2995	package CFPlus::UI::TextScroller;
2346		2996
2347	our @ISA = CFClient::UI::HBox::;	2997	our @ISA = CFPlus::UI::HBox::;
2348		2998
2349	use CFClient::OpenGL;	2999	use CFPlus::OpenGL;
2350		3000
2351	sub new {	3001	sub new {
2352	my $class = shift;	3002	my $class = shift;
2353		3003
2354	my $self = $class->SUPER::new (	3004	my $self = $class->SUPER::new (
2355	fontsize => 1,	3005	fontsize => 1,
2356	can_events => 0,	3006	can_events => 1,
		3007	indent => 0,
2357	#font => default_font	3008	#font => default_font
2358	@_,	3009	@_,
2359		3010
2360	layout => (new CFClient::Layout 1),	3011	layout => (new CFPlus::Layout),
2361	par => [],	3012	par => [],
		3013	max_par => 0,
2362	height => 0,	3014	height => 0,
2363	children => [	3015	children => [
2364	(new CFClient::UI::Empty expand => 1),	3016	(new CFPlus::UI::Empty expand => 1),
2365	(new CFClient::UI::Slider vertical => 1),	3017	(new CFPlus::UI::Slider vertical => 1),
2366	],	3018	],
2367	);	3019	);
2368		3020
2369	$self->{children}[1]->connect (changed => sub { $self->update });	3021	$self->{children}[1]->connect (changed => sub { $self->update });
2370		3022
…		…
2376		3028
2377	$self->{fontsize} = $fontsize;	3029	$self->{fontsize} = $fontsize;
2378	$self->reflow;	3030	$self->reflow;
2379	}	3031	}
2380		3032
		3033	sub size_request {
		3034	my ($self) = @_;
		3035
		3036	my ($empty, $slider) = @{ $self->{children} };
		3037
		3038	local $self->{children} = [$empty, $slider];
		3039	$self->SUPER::size_request
		3040	}
		3041
2381	sub size_allocate {	3042	sub invoke_size_allocate {
2382	my ($self, $w, $h, $changed) = @_;	3043	my ($self, $w, $h) = @_;
2383		3044
2384	$self->SUPER::size_allocate ($w, $h, $changed);	3045	my ($empty, $slider, @other) = @{ $self->{children} };
2385		3046	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386	return unless $changed;
2387		3047
2388	$self->{layout}->set_font ($self->{font}) if $self->{font};	3048	$self->{layout}->set_font ($self->{font}) if $self->{font};
2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3049	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390	$self->{layout}->set_width ($self->{children}[0]{w});	3050	$self->{layout}->set_width ($empty->{w});
		3051	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391		3052
2392	$self->reflow;	3053	$self->reflow;
2393	}
2394		3054
2395	sub text_size {	3055	local $self->{children} = [$empty, $slider];
		3056	$self->SUPER::invoke_size_allocate ($w, $h)
		3057	}
		3058
		3059	sub invoke_mouse_wheel {
2396	my ($self, $text, $indent) = @_;	3060	my ($self, $ev) = @_;
		3061
		3062	return 0 unless $ev->{dy}; # only vertical movements
		3063
		3064	$self->{children}[1]->emit (mouse_wheel => $ev);
		3065
		3066	1
		3067	}
		3068
		3069	sub get_layout {
		3070	my ($self, $para) = @_;
2397		3071
2398	my $layout = $self->{layout};	3072	my $layout = $self->{layout};
2399		3073
		3074	$layout->set_font ($self->{font}) if $self->{font};
		3075	$layout->set_foreground (@{$para->{fg}});
2400	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3076	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401	$layout->set_width ($self->{children}[0]{w} - $indent);	3077	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3078	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402	$layout->set_markup ($text);	3079	$layout->set_markup ($para->{markup});
		3080
		3081	$layout->set_shapes (
		3082	map
		3083	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3084	@{$para->{widget}}
2403		3085	);
		3086
2404	$layout->size	3087	$layout
2405	}	3088	}
2406		3089
2407	sub reflow {	3090	sub reflow {
2408	my ($self) = @_;	3091	my ($self) = @_;
2409		3092
…		…
2416		3099
2417	# todo: base offset on lines or so, not on pixels	3100	# todo: base offset on lines or so, not on pixels
2418	$self->{children}[1]->set_value ($offset);	3101	$self->{children}[1]->set_value ($offset);
2419	}	3102	}
2420		3103
		3104	sub current_paragraph {
		3105	my ($self) = @_;
		3106
		3107	$self->{top_paragraph} - 1
		3108	}
		3109
		3110	sub scroll_to {
		3111	my ($self, $para) = @_;
		3112
		3113	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3114
		3115	$self->{scroll_to} = $para;
		3116	$self->update;
		3117	}
		3118
2421	sub clear {	3119	sub clear {
2422	my ($self) = @_;	3120	my ($self) = @_;
		3121
		3122	my (undef, undef, @other) = @{ $self->{children} };
		3123	$self->remove ($_) for @other;
2423		3124
2424	$self->{par} = [];	3125	$self->{par} = [];
2425	$self->{height} = 0;	3126	$self->{height} = 0;
2426	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3127	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427	}	3128	}
2428		3129
2429	sub add_paragraph {	3130	sub add_paragraph {
2430	my ($self, $color, $text, $indent) = @_;	3131	my $self = shift;
2431		3132
2432	for my $line (split /\n/, $text) {	3133	for my $para (@_) {
2433	my ($w, $h) = $self->text_size ($line);	3134	$para = {
		3135	fg => [1, 1, 1, 1],
		3136	indent => 0,
		3137	markup => "",
		3138	widget => [],
		3139	ref $para ? %$para : (markup => $para),
		3140	w => 1e10,
		3141	wrapped => 1,
		3142	};
		3143
		3144	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3145	push @{$self->{par}}, $para;
		3146	}
		3147
		3148	if (my $max = $self->{max_par}) {
		3149	shift @{$self->{par}} while @{$self->{par}} > $max;
		3150	}
		3151
		3152	$self->{need_reflow}++;
		3153	$self->update;
		3154	}
		3155
		3156	sub scroll_to_bottom {
		3157	my ($self) = @_;
		3158
		3159	$self->{scroll_to} = $#{$self->{par}};
		3160	$self->update;
		3161	}
		3162
		3163	sub force_uptodate {
		3164	my ($self) = @_;
		3165
		3166	if (delete $self->{need_reflow}) {
		3167	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3168
		3169	my $height = 0;
		3170
		3171	for my $para (@{$self->{par}}) {
		3172	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3173	my $layout = $self->get_layout ($para);
		3174	my ($w, $h) = $layout->size;
		3175
		3176	$para->{w} = $w + $para->{indent};
		3177	$para->{h} = $h;
		3178	$para->{wrapped} = $layout->has_wrapped;
		3179	}
		3180
		3181	$para->{y} = $height;
		3182	$height += $para->{h};
		3183	}
		3184
2434	$self->{height} += $h;	3185	$self->{height} = $height;
2435	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3186	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2436	}
2437		3187
2438	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3188	delete $self->{texture};
		3189	}
		3190
		3191	if (my $paridx = delete $self->{scroll_to}) {
		3192	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3193	}
2439	}	3194	}
2440		3195
2441	sub update {	3196	sub update {
2442	my ($self) = @_;	3197	my ($self) = @_;
2443		3198
…		…
2445		3200
2446	return unless $self->{h} > 0;	3201	return unless $self->{h} > 0;
2447		3202
2448	delete $self->{texture};	3203	delete $self->{texture};
2449		3204
2450	$ROOT->on_post_alloc ($self, sub {	3205	$ROOT->on_post_alloc ($self => sub {
		3206	$self->force_uptodate;
		3207
2451	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3208	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452		3209
2453	if (delete $self->{need_reflow}) {
2454	my $height = 0;
2455
2456	my $layout = $self->{layout};
2457
2458	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460	for (@{$self->{par}}) {
2461	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462	$layout->set_width ($W - $_->[3]);
2463	$layout->set_markup ($_->[4]);
2464	my ($w, $h) = $layout->size;
2465	$_->[0] = $w + $_->[3];
2466	$_->[1] = $h;
2467	}
2468
2469	$height += $_->[1];
2470	}
2471
2472	$self->{height} = $height;
2473
2474	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2475
2476	delete $self->{texture};
2477	}
2478
2479	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3210	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2480	glClearColor 0.5, 0.5, 0.5, 0;	3211	glClearColor 0, 0, 0, 0;
2481	glClear GL_COLOR_BUFFER_BIT;	3212	glClear GL_COLOR_BUFFER_BIT;
2482		3213
		3214	package CFPlus::UI::Base;
		3215	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3216	(0, 0, $self->{w}, $self->{h});
		3217
		3218	my $top = int $self->{children}[1]{range}[0];
		3219
		3220	my $paridx = 0;
		3221	my $top_paragraph;
2483	my $top = int $self->{children}[1]{range}[0];	3222	my $top = int $self->{children}[1]{range}[0];
2484		3223
2485	my $y0 = $top;	3224	my $y0 = $top;
2486	my $y1 = $top + $H;	3225	my $y1 = $top + $H;
2487		3226
2488	my $y = 0;
2489
2490	my $layout = $self->{layout};
2491
2492	$layout->set_font ($self->{font}) if $self->{font};
2493
2494	glEnable GL_BLEND;
2495	#TODO# not correct in windows where rgba is forced off
2496	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497
2498	for my $par (@{$self->{par}}) {	3227	for my $para (@{$self->{par}}) {
2499	my $h = $par->[1];	3228	my $h = $para->{h};
		3229	my $y = $para->{y};
2500		3230
2501	if ($y0 < $y + $h && $y < $y1) {	3231	if ($y0 < $y + $h && $y < $y1) {
2502	$layout->set_foreground (@{ $par->[2] });	3232	my $layout = $self->get_layout ($para);
2503	$layout->set_width ($W - $par->[3]);
2504	$layout->set_markup ($par->[4]);
2505		3233
2506	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3234	$layout->render ($para->{indent}, $y - $y0);
2507		3235
2508	glRasterPos $par->[3], $y - $y0;	3236	if (my @w = @{ $para->{widget} }) {
2509	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3237	my @s = $layout->get_shapes;
		3238
		3239	for (@w) {
		3240	my ($dx, $dy) = splice @s, 0, 2, ();
		3241
		3242	$_->{x} = $dx + $para->{indent};
		3243	$_->{y} = $dy + $y - $y0;
		3244
		3245	$_->draw;
		3246	}
		3247	}
2510	}	3248	}
2511		3249
2512	$y += $h;	3250	$paridx++;
		3251	$top_paragraph ||= $paridx if $y >= $top;
2513	}	3252	}
2514		3253
2515	glDisable GL_BLEND;	3254	$self->{top_paragraph} = $top_paragraph;
2516	};	3255	};
2517	});	3256	});
2518	}	3257	}
2519		3258
		3259	sub reconfigure {
		3260	my ($self) = @_;
		3261
		3262	$self->SUPER::reconfigure;
		3263
		3264	$_->{w} = 1e10 for @{ $self->{par} };
		3265	$self->reflow;
		3266	}
		3267
2520	sub _draw {	3268	sub _draw {
2521	my ($self) = @_;	3269	my ($self) = @_;
2522		3270
2523	glEnable GL_TEXTURE_2D;	3271	glEnable GL_TEXTURE_2D;
2524	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3272	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525	glColor 1, 1, 1, 1;	3273	glColor 0, 0, 0, 1;
2526	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3274	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527	glDisable GL_TEXTURE_2D;	3275	glDisable GL_TEXTURE_2D;
2528		3276
2529	$self->{children}[1]->draw;	3277	$self->{children}[1]->draw;
2530
2531	}	3278	}
2532		3279
2533	#############################################################################	3280	#############################################################################
2534		3281
2535	package CFClient::UI::Animator;	3282	package CFPlus::UI::Animator;
2536		3283
2537	use CFClient::OpenGL;	3284	use CFPlus::OpenGL;
2538		3285
2539	our @ISA = CFClient::UI::Bin::;	3286	our @ISA = CFPlus::UI::Bin::;
2540		3287
2541	sub moveto {	3288	sub moveto {
2542	my ($self, $x, $y) = @_;	3289	my ($self, $x, $y) = @_;
2543		3290
2544	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3291	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2572	glPopMatrix;	3319	glPopMatrix;
2573	}	3320	}
2574		3321
2575	#############################################################################	3322	#############################################################################
2576		3323
2577	package CFClient::UI::Flopper;	3324	package CFPlus::UI::Flopper;
2578		3325
2579	our @ISA = CFClient::UI::Button::;	3326	our @ISA = CFPlus::UI::Button::;
2580		3327
2581	sub new {	3328	sub new {
2582	my $class = shift;	3329	my $class = shift;
2583		3330
2584	my $self = $class->SUPER::new (	3331	my $self = $class->SUPER::new (
…		…
2596	$self->{other}->toggle_visibility;	3343	$self->{other}->toggle_visibility;
2597	}	3344	}
2598		3345
2599	#############################################################################	3346	#############################################################################
2600		3347
2601	package CFClient::UI::Tooltip;	3348	package CFPlus::UI::Tooltip;
2602		3349
2603	our @ISA = CFClient::UI::Bin::;	3350	our @ISA = CFPlus::UI::Bin::;
2604		3351
2605	use CFClient::OpenGL;	3352	use CFPlus::OpenGL;
2606		3353
2607	sub new {	3354	sub new {
2608	my $class = shift;	3355	my $class = shift;
2609		3356
2610	$class->SUPER::new (	3357	$class->SUPER::new (
…		…
2614	}	3361	}
2615		3362
2616	sub set_tooltip_from {	3363	sub set_tooltip_from {
2617	my ($self, $widget) = @_;	3364	my ($self, $widget) = @_;
2618		3365
		3366	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3367	if $widget->{tooltip} =~ /^#(.*)$/;
		3368
		3369	my $tooltip = $widget->{tooltip};
		3370
		3371	if ($ENV{CFPLUS_DEBUG} & 2) {
		3372	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3373	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3374	. "req $widget->{req_w} $widget->{req_h}\n"
		3375	. "visible $widget->{visible}";
		3376	}
		3377
		3378	$tooltip =~ s/^\n+//;
		3379	$tooltip =~ s/\n+$//;
		3380
2619	$self->add (new CFClient::UI::Label	3381	$self->add (new CFPlus::UI::Label
2620	markup => $widget->{tooltip},	3382	markup => $tooltip,
2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3383	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622	fontsize => 0.8,	3384	fontsize => 0.8,
2623	fg => [0, 0, 0, 1],	3385	style => 1, # FLAG_INVERSE
2624	ellipsise => 0,	3386	ellipsise => 0,
2625	font => ($widget->{tooltip_font} || $::FONT_PROP),	3387	font => ($widget->{tooltip_font} || $::FONT_PROP),
2626	);	3388	);
2627	}	3389	}
2628		3390
…		…
2632	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633		3395
2634	($w + 4, $h + 4)	3396	($w + 4, $h + 4)
2635	}	3397	}
2636		3398
2637	sub size_allocate {	3399	sub invoke_size_allocate {
2638	my ($self, $w, $h, $changed) = @_;	3400	my ($self, $w, $h) = @_;
2639		3401
2640	return unless $changed;
2641
2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3402	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3403	}
		3404
		3405	sub invoke_visibility_change {
		3406	my ($self, $visible) = @_;
		3407
		3408	return unless $visible;
		3409
		3410	$self->{root}->on_post_alloc ("move_$self" => sub {
		3411	my $widget = $self->{owner}
		3412	or return;
		3413
		3414	if ($widget->{visible}) {
		3415	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3416
		3417	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3418	if $x + $self->{w} > $self->{root}{w};
		3419
		3420	$self->move_abs ($x, $y);
		3421	} else {
		3422	$self->hide;
		3423	}
		3424	});
2643	}	3425	}
2644		3426
2645	sub _draw {	3427	sub _draw {
2646	my ($self) = @_;	3428	my ($self) = @_;
2647		3429
…		…
2664	glVertex $w, $h;	3446	glVertex $w, $h;
2665	glVertex $w, 0;	3447	glVertex $w, 0;
2666	glEnd;	3448	glEnd;
2667		3449
2668	glTranslate 2 - 0.375, 2 - 0.375;	3450	glTranslate 2 - 0.375, 2 - 0.375;
		3451
2669	$self->SUPER::_draw;	3452	$self->SUPER::_draw;
2670	}	3453	}
2671		3454
2672	#############################################################################	3455	#############################################################################
2673		3456
2674	package CFClient::UI::Face;	3457	package CFPlus::UI::Face;
2675		3458
2676	our @ISA = CFClient::UI::Base::;	3459	our @ISA = CFPlus::UI::DrawBG::;
2677		3460
2678	use CFClient::OpenGL;	3461	use CFPlus::OpenGL;
2679		3462
2680	sub new {	3463	sub new {
2681	my $class = shift;	3464	my $class = shift;
2682		3465
2683	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
		3467	size_w => 32,
		3468	size_h => 8,
2684	aspect => 1,	3469	aspect => 1,
2685	can_events => 0,	3470	can_events => 0,
2686	@_,	3471	@_,
2687	);	3472	);
2688		3473
2689	if ($self->{anim} && $self->{animspeed}) {	3474	if ($self->{anim} && $self->{animspeed}) {
2690	Scalar::Util::weaken (my $widget = $self);	3475	CFPlus::weaken (my $widget = $self);
2691		3476
		3477	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3478	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2692	$self->{timer} = Event->timer (	3479	$self->{timer} = Event->timer (
2693	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2694	hard => 1,	3480	parked => 1,
2695	interval => $self->{animspeed},
2696	cb => sub {	3481	cb => sub {
		3482	return unless $::CONN && $widget;
		3483
2697	++$widget->{frame};	3484	++$widget->{frame};
		3485	$widget->update_face;
2698	$widget->update;	3486	$widget->update;
		3487
		3488	$widget->update_timer;
2699	},	3489	},
2700	);	3490	);
		3491
		3492	$self->update_face;
		3493	$self->update_timer;
2701	}	3494	}
2702		3495
2703	$self	3496	$self
2704	}	3497	}
2705		3498
		3499	sub update_timer {
		3500	my ($self) = @_;
		3501
		3502	return unless $self->{timer};
		3503
		3504	if ($self->{visible}) {
		3505	$self->{timer}->at (
		3506	$self->{anim_start}
		3507	+ $self->{animspeed}
		3508	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3509	);
		3510	$self->{timer}->start;
		3511	} else {
		3512	$self->{timer}->stop;
		3513	}
		3514	}
		3515
		3516	sub update_face {
		3517	my ($self) = @_;
		3518
		3519	return unless $::CONN;
		3520
		3521	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3522	if ($anim && @$anim) {
		3523	delete $self->{wait_face};
		3524	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3525	}
		3526	}
		3527	}
		3528
2706	sub size_request {	3529	sub size_request {
2707	(32, 8)	3530	my ($self) = @_;
		3531
		3532	if ($::CONN) {
		3533	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3534	if (my $tex = $::CONN->{texture}[$faceid]) {
		3535	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3536	} else {
		3537	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3538	$self->realloc;
		3539	});
		3540	}
		3541	}
		3542	}
		3543
		3544	($self->{size_w} || 8, $self->{size_h} || 8)
2708	}	3545	}
2709		3546
2710	sub update {	3547	sub update {
2711	my ($self) = @_;	3548	my ($self) = @_;
2712		3549
2713	return unless $self->{visible};	3550	return unless $self->{visible};
2714		3551
2715	$self->SUPER::update;	3552	$self->SUPER::update;
2716	}	3553	}
2717		3554
		3555	sub invoke_visibility_change {
		3556	my ($self) = @_;
		3557
		3558	$self->update_timer;
		3559
		3560	0
		3561	}
		3562
2718	sub _draw {	3563	sub _draw {
2719	my ($self) = @_;	3564	my ($self) = @_;
2720		3565
2721	return unless $::CONN;	3566	return unless $::CONN;
2722		3567
2723	my $face;	3568	$self->SUPER::_draw;
2724		3569
2725	if ($self->{frame}) {
2726	my $anim = $::CONN->{anim}[$self->{anim}];	3570	my $faceid = $::CONN->{faceid}[$self->{face}]
2727		3571	or return;
2728	$face = $anim->[ $self->{frame} % @$anim ]
2729	if $anim && @$anim;
2730	}
2731		3572
2732	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3573	my $tex = $::CONN->{texture}[$faceid];
2733		3574
2734	if ($tex) {	3575	if ($tex) {
2735	glEnable GL_TEXTURE_2D;	3576	glEnable GL_TEXTURE_2D;
2736	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3577	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737	glColor 1, 1, 1, 1;	3578	glColor 0, 0, 0, 1;
2738	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3579	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739	glDisable GL_TEXTURE_2D;	3580	glDisable GL_TEXTURE_2D;
2740	}	3581	}
2741	}	3582	}
2742		3583
2743	sub DESTROY {	3584	sub destroy {
2744	my ($self) = @_;	3585	my ($self) = @_;
2745		3586
2746	$self->{timer}->cancel	3587	(delete $self->{timer})->cancel
2747	if $self->{timer};	3588	if $self->{timer};
2748		3589
2749	$self->SUPER::DESTROY;	3590	$self->SUPER::destroy;
2750	}	3591	}
2751		3592
2752	#############################################################################	3593	#############################################################################
2753		3594
2754	package CFClient::UI::Inventory;	3595	package CFPlus::UI::Buttonbar;
2755		3596
2756	our @ISA = CFClient::UI::ScrolledWindow::;	3597	our @ISA = CFPlus::UI::HBox::;
2757		3598
2758	sub new {	3599	# TODO: should actually wrap buttons and other goodies.
2759	my $class = shift;
2760
2761	my $self = $class->SUPER::new (
2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763	@_,
2764	);
2765
2766	$self
2767	}
2768
2769	sub set_items {
2770	my ($self, $items) = @_;
2771
2772	$self->{scrolled}->clear;
2773	return unless $items;
2774
2775	my @items = sort {
2776	($a->{type} <=> $b->{type})
2777	or ($a->{name} cmp $b->{name})
2778	} @$items;
2779
2780	$self->{real_items} = \@items;
2781
2782	my $row = 0;
2783	for my $item (@items) {
2784	CFClient::Item::update_widgets $item;
2785
2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790	$row++;
2791	}
2792	}
2793		3600
2794	#############################################################################	3601	#############################################################################
2795		3602
2796	package CFClient::UI::Menu;	3603	package CFPlus::UI::Menu;
2797		3604
2798	our @ISA = CFClient::UI::FancyFrame::;	3605	our @ISA = CFPlus::UI::Toplevel::;
2799		3606
2800	use CFClient::OpenGL;	3607	use CFPlus::OpenGL;
2801		3608
2802	sub new {	3609	sub new {
2803	my $class = shift;	3610	my $class = shift;
2804		3611
2805	my $self = $class->SUPER::new (	3612	my $self = $class->SUPER::new (
2806	items => [],	3613	items => [],
2807	z => 100,	3614	z => 100,
2808	@_,	3615	@_,
2809	);	3616	);
2810		3617
2811	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3618	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2812		3619
2813	for my $item (@{ $self->{items} }) {	3620	for my $item (@{ $self->{items} }) {
2814	my ($widget, $cb) = @$item;	3621	my ($widget, $cb, $tooltip) = @$item;
2815		3622
2816	# handle various types of items, only text for now	3623	# handle various types of items, only text for now
2817	if (!ref $widget) {	3624	if (!ref $widget) {
		3625	if ($widget =~ /\t/) {
		3626	my ($left, $right) = split /\t/, $widget, 2;
		3627
2818	$widget = new CFClient::UI::Label	3628	$widget = new CFPlus::UI::HBox
2819	can_hover => 1,	3629	can_hover => 1,
2820	can_events => 1,	3630	can_events => 1,
		3631	tooltip => $tooltip,
		3632	children => [
		3633	(new CFPlus::UI::Label markup => $left, expand => 1),
		3634	(new CFPlus::UI::Label markup => $right, align => +1),
		3635	],
		3636	;
		3637
		3638	} else {
		3639	$widget = new CFPlus::UI::Label
		3640	can_hover => 1,
		3641	can_events => 1,
2821	text => $widget;	3642	markup => $widget,
		3643	tooltip => $tooltip;
		3644	}
2822	}	3645	}
2823		3646
2824	$self->{item}{$widget} = $item;	3647	$self->{item}{$widget} = $item;
2825		3648
2826	$self->{vbox}->add ($widget);	3649	$self->{vbox}->add ($widget);
…		…
2831		3654
2832	# popup given the event (must be a mouse button down event currently)	3655	# popup given the event (must be a mouse button down event currently)
2833	sub popup {	3656	sub popup {
2834	my ($self, $ev) = @_;	3657	my ($self, $ev) = @_;
2835		3658
2836	$self->_emit ("popdown");	3659	$self->emit ("popdown");
2837		3660
2838	# maybe save $GRAB? must be careful about events...	3661	# maybe save $GRAB? must be careful about events...
2839	$GRAB = $self;	3662	$GRAB = $self;
2840	$self->{button} = $ev->{button};	3663	$self->{button} = $ev->{button};
2841		3664
2842	$self->show;	3665	$self->show;
2843	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3666	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844	}	3667	}
2845		3668
2846	sub mouse_motion {	3669	sub invoke_mouse_motion {
2847	my ($self, $ev, $x, $y) = @_;	3670	my ($self, $ev, $x, $y) = @_;
2848		3671
2849	# TODO: should use vbox->find_widget or so	3672	# TODO: should use vbox->find_widget or so
2850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3673	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851	$self->{hover} = $self->{item}{$HOVER};	3674	$self->{hover} = $self->{item}{$HOVER};
2852	}
2853		3675
		3676	0
		3677	}
		3678
2854	sub button_up {	3679	sub invoke_button_up {
2855	my ($self, $ev, $x, $y) = @_;	3680	my ($self, $ev, $x, $y) = @_;
2856		3681
2857	if ($ev->{button} == $self->{button}) {	3682	if ($ev->{button} == $self->{button}) {
2858	undef $GRAB;	3683	undef $GRAB;
2859	$self->hide;	3684	$self->hide;
2860		3685
2861	$self->_emit ("popdown");	3686	$self->emit ("popdown");
2862	$self->{hover}[1]->() if $self->{hover};	3687	$self->{hover}[1]->() if $self->{hover};
		3688	} else {
		3689	return 0
		3690	}
		3691
2863	}	3692	1
2864	}	3693	}
2865		3694
2866	#############################################################################	3695	#############################################################################
2867		3696
2868	package CFClient::UI::Statusbox;	3697	package CFPlus::UI::Multiplexer;
2869		3698
2870	our @ISA = CFClient::UI::VBox::;	3699	our @ISA = CFPlus::UI::Container::;
2871		3700
2872	sub new {	3701	sub new {
2873	my $class = shift;	3702	my $class = shift;
2874		3703
2875	$class->SUPER::new (	3704	my $self = $class->SUPER::new (
		3705	@_,
		3706	);
		3707
		3708	$self->{current} = $self->{children}[0]
		3709	if @{ $self->{children} };
		3710
		3711	$self
		3712	}
		3713
		3714	sub add {
		3715	my ($self, @widgets) = @_;
		3716
		3717	$self->SUPER::add (@widgets);
		3718
		3719	$self->{current} = $self->{children}[0]
		3720	if @{ $self->{children} };
		3721	}
		3722
		3723	sub get_current_page {
		3724	my ($self) = @_;
		3725
		3726	$self->{current}
		3727	}
		3728
		3729	sub set_current_page {
		3730	my ($self, $page_or_widget) = @_;
		3731
		3732	my $widget = ref $page_or_widget
		3733	? $page_or_widget
		3734	: $self->{children}[$page_or_widget];
		3735
		3736	$self->{current} = $widget;
		3737	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3738
		3739	$self->emit (page_changed => $self->{current});
		3740
		3741	$self->realloc;
		3742	}
		3743
		3744	sub visible_children {
		3745	$_[0]{current}
		3746	}
		3747
		3748	sub size_request {
		3749	my ($self) = @_;
		3750
		3751	$self->{current}->size_request
		3752	}
		3753
		3754	sub invoke_size_allocate {
		3755	my ($self, $w, $h) = @_;
		3756
		3757	$self->{current}->configure (0, 0, $w, $h);
		3758
		3759	1
		3760	}
		3761
		3762	sub _draw {
		3763	my ($self) = @_;
		3764
		3765	$self->{current}->draw;
		3766	}
		3767
		3768	#############################################################################
		3769
		3770	package CFPlus::UI::Notebook;
		3771
		3772	our @ISA = CFPlus::UI::VBox::;
		3773
		3774	sub new {
		3775	my $class = shift;
		3776
		3777	my $self = $class->SUPER::new (
		3778	buttonbar => (new CFPlus::UI::Buttonbar),
		3779	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3780	# filter => # will be put between multiplexer and $self
		3781	@_,
		3782	);
		3783
		3784	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3785	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3786
		3787	$self
		3788	}
		3789
		3790	sub add {
		3791	my ($self, $title, $widget, $tooltip) = @_;
		3792
		3793	CFPlus::weaken $self;
		3794
		3795	$self->{buttonbar}->add (new CFPlus::UI::Button
		3796	markup => $title,
		3797	tooltip => $tooltip,
		3798	on_activate => sub { $self->set_current_page ($widget) },
		3799	);
		3800
		3801	$self->{multiplexer}->add ($widget);
		3802	}
		3803
		3804	sub get_current_page {
		3805	my ($self) = @_;
		3806
		3807	$self->{multiplexer}->get_current_page
		3808	}
		3809
		3810	sub set_current_page {
		3811	my ($self, $page) = @_;
		3812
		3813	$self->{multiplexer}->set_current_page ($page);
		3814	$self->emit (page_changed => $self->{multiplexer}{current});
		3815	}
		3816
		3817	#############################################################################
		3818
		3819	package CFPlus::UI::Selector;
		3820
		3821	use utf8;
		3822
		3823	our @ISA = CFPlus::UI::Button::;
		3824
		3825	sub new {
		3826	my $class = shift;
		3827
		3828	my $self = $class->SUPER::new (
		3829	options => [], # [value, title, longdesc], ...
		3830	value => undef,
		3831	@_,
		3832	);
		3833
		3834	$self->_set_value ($self->{value});
		3835
		3836	$self
		3837	}
		3838
		3839	sub invoke_button_down {
		3840	my ($self, $ev) = @_;
		3841
		3842	my @menu_items;
		3843
		3844	for (@{ $self->{options} }) {
		3845	my ($value, $title, $tooltip) = @$_;
		3846
		3847	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3848	}
		3849
		3850	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3851	}
		3852
		3853	sub _set_value {
		3854	my ($self, $value) = @_;
		3855
		3856	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3857	or return;
		3858
		3859	$self->{value} = $item->[0];
		3860	$self->set_markup ("$item->[1] ⇓");
		3861	$self->set_tooltip ($item->[2]);
		3862	}
		3863
		3864	sub set_value {
		3865	my ($self, $value) = @_;
		3866
		3867	return unless $self->{value} ne $value;
		3868
		3869	$self->_set_value ($value);
		3870	$self->emit (changed => $value);
		3871	}
		3872
		3873	#############################################################################
		3874
		3875	package CFPlus::UI::Statusbox;
		3876
		3877	our @ISA = CFPlus::UI::VBox::;
		3878
		3879	sub new {
		3880	my $class = shift;
		3881
		3882	my $self = $class->SUPER::new (
2876	fontsize => 0.8,	3883	fontsize => 0.8,
2877	@_,	3884	@_,
2878	)	3885	);
		3886
		3887	CFPlus::weaken (my $this = $self);
		3888
		3889	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3890
		3891	$self
2879	}	3892	}
2880		3893
2881	sub reorder {	3894	sub reorder {
2882	my ($self) = @_;	3895	my ($self) = @_;
2883	my $NOW = time;	3896	my $NOW = Time::HiRes::time;
		3897
		3898	# freeze display when hovering over any label
		3899	return if $CFPlus::UI::TOOLTIP->{owner}
		3900	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3901	values %{ $self->{item} };
2884		3902
2885	while (my ($k, $v) = each %{ $self->{item} }) {	3903	while (my ($k, $v) = each %{ $self->{item} }) {
2886	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3904	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887	}	3905	}
2888		3906
…		…
2891	my @items = sort {	3909	my @items = sort {
2892	$a->{pri} <=> $b->{pri}	3910	$a->{pri} <=> $b->{pri}
2893	or $b->{id} <=> $a->{id}	3911	or $b->{id} <=> $a->{id}
2894	} values %{ $self->{item} };	3912	} values %{ $self->{item} };
2895		3913
		3914	$self->{timer}->interval (1);
		3915
2896	my $count = 10 + 1;	3916	my $count = 10 + 1;
2897	for my $item (@items) {	3917	for my $item (@items) {
2898	last unless --$count;	3918	last unless --$count;
2899		3919
2900	push @widgets, $item->{label} ||= do {	3920	my $label = $item->{label} ||= do {
2901	# TODO: doesn't handle markup well (read as: at all)	3921	# TODO: doesn't handle markup well (read as: at all)
2902	my $short = $item->{count} > 1	3922	my $short = $item->{count} > 1
2903	? "<b>$item->{count} ×</b> $item->{text}"	3923	? "<b>$item->{count} ×</b> $item->{text}"
2904	: $item->{text};	3924	: $item->{text};
2905		3925
2906	for ($short) {	3926	for ($short) {
2907	s/^\s+//;	3927	s/^\s+//;
2908	s/\s+/ /g;	3928	s/\s+/ /g;
2909	}	3929	}
2910		3930
2911	new CFClient::UI::Label	3931	new CFPlus::UI::Label
2912	markup => $short,	3932	markup => $short,
2913	tooltip => $item->{tooltip},	3933	tooltip => $item->{tooltip},
2914	tooltip_font => $::FONT_PROP,	3934	tooltip_font => $::FONT_PROP,
2915	tooltip_width => 0.67,	3935	tooltip_width => 0.67,
2916	fontsize => $item->{fontsize} || $self->{fontsize},	3936	fontsize => $item->{fontsize} || $self->{fontsize},
2917	max_w => $::WIDTH * 0.44,	3937	max_w => $::WIDTH * 0.44,
2918	fg => $item->{fg},	3938	fg => [@{ $item->{fg} }],
2919	can_events => 1,	3939	can_events => 1,
2920	can_hover => 1	3940	can_hover => 1
2921	};	3941	};
		3942
		3943	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3944	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3945	$label->update;
		3946	$label->set_max_size (undef, $label->{req_h} * $diff)
		3947	if $diff < 1;
		3948	$self->{timer}->interval (1/30);
		3949	} else {
		3950	$label->{fg}[3] = $item->{fg}[3] || 1;
		3951	}
		3952
		3953	push @widgets, $label;
2922	}	3954	}
2923		3955
2924	$self->clear;	3956	$self->clear;
2925	$self->SUPER::add (reverse @widgets);	3957	$self->SUPER::add (reverse @widgets);
2926	}	3958	}
…		…
2931	$text =~ s/^\s+//;	3963	$text =~ s/^\s+//;
2932	$text =~ s/\s+$//;	3964	$text =~ s/\s+$//;
2933		3965
2934	return unless $text;	3966	return unless $text;
2935		3967
2936	my $timeout = time + ((delete $arg{timeout}) || 60);	3968	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937		3969
2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3970	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939		3971
2940	if (my $item = $self->{item}{$group}) {	3972	if (my $item = $self->{item}{$group}) {
2941	if ($item->{text} eq $text) {	3973	if ($item->{text} eq $text) {
2942	$item->{count}++;	3974	$item->{count}++;
2943	} else {	3975	} else {
2944	$item->{count} = 1;	3976	$item->{count} = 1;
2945	$item->{text} = $item->{tooltip} = $text;	3977	$item->{text} = $item->{tooltip} = $text;
2946	}	3978	}
2947	$item->{id} = ++$self->{id};	3979	$item->{id} += 0.2;#d#
2948	$item->{timeout} = $timeout;	3980	$item->{timeout} = $timeout;
2949	delete $item->{label};	3981	delete $item->{label};
2950	} else {	3982	} else {
2951	$self->{item}{$group} = {	3983	$self->{item}{$group} = {
2952	id => ++$self->{id},	3984	id => ++$self->{id},
…		…
2958	count => 1,	3990	count => 1,
2959	%arg,	3991	%arg,
2960	};	3992	};
2961	}	3993	}
2962		3994
		3995	$ROOT->on_refresh (reorder => sub {
2963	$self->reorder;	3996	$self->reorder;
		3997	});
2964	}	3998	}
2965		3999
2966	sub reconfigure {	4000	sub reconfigure {
2967	my ($self) = @_;	4001	my ($self) = @_;
2968		4002
…		…
2971		4005
2972	$self->reorder;	4006	$self->reorder;
2973	$self->SUPER::reconfigure;	4007	$self->SUPER::reconfigure;
2974	}	4008	}
2975		4009
		4010	sub destroy {
		4011	my ($self) = @_;
		4012
		4013	$self->{timer}->cancel;
		4014
		4015	$self->SUPER::destroy;
		4016	}
		4017
2976	#############################################################################	4018	#############################################################################
2977		4019
2978	package CFClient::UI::Root;	4020	package CFPlus::UI::Root;
2979		4021
2980	our @ISA = CFClient::UI::Container::;	4022	our @ISA = CFPlus::UI::Container::;
2981		4023
		4024	use List::Util qw(min max);
		4025
2982	use CFClient::OpenGL;	4026	use CFPlus::OpenGL;
2983		4027
2984	sub new {	4028	sub new {
2985	my $class = shift;	4029	my $class = shift;
2986		4030
2987	my $self = $class->SUPER::new (	4031	my $self = $class->SUPER::new (
2988	visible => 1,	4032	visible => 1,
2989	@_,	4033	@_,
2990	);	4034	);
2991		4035
2992	Scalar::Util::weaken ($self->{root} = $self);	4036	CFPlus::weaken ($self->{root} = $self);
2993		4037
2994	$self	4038	$self
2995	}	4039	}
2996		4040
2997	sub configure {
2998	my ($self, $x, $y, $w, $h) = @_;
2999
3000	$self->{w} = $w;
3001	$self->{h} = $h;
3002	}
3003
3004	sub reconfigure {
3005	my ($self) = @_;
3006
3007	$self->SUPER::reconfigure;
3008
3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3010	if $self->{w};
3011	}
3012
3013	sub size_request {	4041	sub size_request {
3014	my ($self) = @_;	4042	my ($self) = @_;
3015		4043
3016	($self->{w}, $self->{h})	4044	($self->{w}, $self->{h})
3017	}	4045	}
3018		4046
		4047	sub _to_pixel {
		4048	my ($coord, $size, $max) = @_;
		4049
		4050	$coord =
		4051	$coord eq "center" ? ($max - $size) * 0.5
		4052	: $coord eq "max" ? $max
		4053	: $coord;
		4054
		4055	$coord = 0 if $coord < 0;
		4056	$coord = $max - $size if $coord > $max - $size;
		4057
		4058	int $coord + 0.5
		4059	}
		4060
3019	sub size_allocate {	4061	sub invoke_size_allocate {
3020	my ($self, $w, $h, $changed) = @_;	4062	my ($self, $w, $h) = @_;
3021		4063
3022	for my $child ($self->children) {	4064	for my $child ($self->children) {
3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024		4066
3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	4067	$X = $child->{force_x} if exists $child->{force_x};
3026	if exists $child->{req_x};	4068	$Y = $child->{force_y} if exists $child->{force_y};
3027		4069
3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	4070	$X = _to_pixel $X, $W, $self->{w};
3029	if exists $child->{req_y};	4071	$Y = _to_pixel $Y, $H, $self->{h};
3030
3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		4072
3036	$child->configure ($X, $Y, $W, $H);	4073	$child->configure ($X, $Y, $W, $H);
3037	}	4074	}
		4075
		4076	1
3038	}	4077	}
3039		4078
3040	sub coord2local {	4079	sub coord2local {
3041	my ($self, $x, $y) = @_;	4080	my ($self, $x, $y) = @_;
3042		4081
…		…
3056	}	4095	}
3057		4096
3058	sub add {	4097	sub add {
3059	my ($self, @children) = @_;	4098	my ($self, @children) = @_;
3060		4099
3061	for my $child (@children) {
3062	$child->{is_toplevel} = 1;	4100	$_->{is_toplevel} = 1
3063		4101	for @children;
3064	# integerise window positions
3065	$child->{x} = int $child->{x};
3066	$child->{y} = int $child->{y};
3067	}
3068		4102
3069	$self->SUPER::add (@children);	4103	$self->SUPER::add (@children);
3070	}	4104	}
3071		4105
3072	sub remove {	4106	sub remove {
3073	my ($self, @children) = @_;	4107	my ($self, @children) = @_;
3074		4108
3075	$self->SUPER::remove (@children);	4109	$self->SUPER::remove (@children);
		4110
		4111	delete $self->{is_toplevel}
		4112	for @children;
3076		4113
3077	while (@children) {	4114	while (@children) {
3078	my $w = pop @children;	4115	my $w = pop @children;
3079	push @children, $w->children;	4116	push @children, $w->children;
3080	$w->set_invisible;	4117	$w->set_invisible;
…		…
3100	$_->()	4137	$_->()
3101	for values %{delete $self->{refresh_hook}};	4138	for values %{delete $self->{refresh_hook}};
3102	}	4139	}
3103		4140
3104	if ($self->{realloc}) {	4141	if ($self->{realloc}) {
		4142	my %queue;
3105	my @queue;	4143	my @queue;
		4144	my $widget;
3106		4145
		4146	outer:
3107	while () {	4147	while () {
3108	if ($self->{realloc}) {	4148	if (my $realloc = delete $self->{realloc}) {
3109	#TODO use array-of-depth approach	4149	for $widget (values %$realloc) {
		4150	$widget->{visible} or next; # do not resize invisible widgets
3110		4151
3111	@queue = sort { $a->{visible} <=> $b->{visible} }	4152	$queue{$widget+0}++ and next; # duplicates are common
3112	@queue, values %{delete $self->{realloc}};	4153
		4154	push @{ $queue[$widget->{visible}] }, $widget;
		4155	}
3113	}	4156	}
3114		4157
		4158	while () {
		4159	@queue or last outer;
		4160
		4161	$widget = pop @{ $queue[-1] || [] }
		4162	and last;
		4163
		4164	pop @queue;
		4165	}
		4166
		4167	delete $queue{$widget+0};
		4168
		4169	my ($w, $h) = $widget->size_request;
		4170
		4171	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4172	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4173
		4174	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4175	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4176
		4177	$w = $widget->{force_w} if exists $widget->{force_w};
		4178	$h = $widget->{force_h} if exists $widget->{force_h};
		4179
		4180	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4181	|| delete $widget->{force_realloc}) {
		4182	$widget->{req_w} = $w;
		4183	$widget->{req_h} = $h;
		4184
		4185	$self->{size_alloc}{$widget+0} = $widget;
		4186
		4187	if (my $parent = $widget->{parent}) {
		4188	$self->{realloc}{$parent+0} = $parent
		4189	unless $queue{$parent+0};
		4190
		4191	$parent->{force_size_alloc} = 1;
		4192	$self->{size_alloc}{$parent+0} = $parent;
		4193	}
		4194	}
		4195
		4196	delete $self->{realloc}{$widget+0};
		4197	}
		4198	}
		4199
		4200	while (my $size_alloc = delete $self->{size_alloc}) {
		4201	my @queue = sort { $b->{visible} <=> $a->{visible} }
		4202	values %$size_alloc;
		4203
		4204	while () {
3115	my $widget = pop @queue || last;	4205	my $widget = pop @queue || last;
3116		4206
3117	$widget->{visible} or last; # do not resize invisible widgets	4207	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120	? @$widget{qw(def_w def_h)}
3121	: $widget->size_request;
3122
3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125	$widget->{req_w} = $w;
3126	$widget->{req_h} = $h;
3127
3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130	push @queue, $widget->{parent}
3131	if $widget->{parent};
3132	}
3133	}
3134
3135	while (my $size_alloc = delete $self->{size_alloc}) {
3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137	values %$size_alloc;
3138
3139	while () {
3140	my ($widget, $w, $h) = @{ pop @queue or last };
3141		4208
3142	$w = 0 if $w < 0;	4209	$w = 0 if $w < 0;
3143	$h = 0 if $h < 0;	4210	$h = 0 if $h < 0;
3144		4211
		4212	$w = max $widget->{min_w}, $w;
		4213	$h = max $widget->{min_h}, $h;
		4214
		4215	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4216	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4217
		4218	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4219	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4220
		4221	$w = int $w + 0.5;
		4222	$h = int $h + 0.5;
		4223
		4224	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4225	$widget->{old_w} = $widget->{w};
		4226	$widget->{old_h} = $widget->{h};
		4227
3145	$widget->{w} = $w;	4228	$widget->{w} = $w;
3146	$widget->{h} = $h;	4229	$widget->{h} = $h;
		4230
3147	$widget->emit (size_allocate => $w, $h, 1);	4231	$widget->emit (size_allocate => $w, $h);
		4232	}
3148	}	4233	}
3149	}	4234	}
3150		4235
3151	while ($self->{post_alloc_hook}) {	4236	while ($self->{post_alloc_hook}) {
3152	$_->()	4237	$_->()
…		…
3161	glLoadIdentity;	4246	glLoadIdentity;
3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4247	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163	glMatrixMode GL_MODELVIEW;	4248	glMatrixMode GL_MODELVIEW;
3164	glLoadIdentity;	4249	glLoadIdentity;
3165		4250
		4251	{
		4252	package CFPlus::UI::Base;
		4253
		4254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4255	(0, 0, $self->{w}, $self->{h});
		4256
3166	$self->_draw;	4257	$self->_draw;
		4258	}
3167	}	4259	}
3168		4260
3169	#############################################################################	4261	#############################################################################
3170		4262
3171	package CFClient::UI;	4263	package CFPlus::UI;
3172		4264
3173	$ROOT = new CFClient::UI::Root;	4265	$ROOT = new CFPlus::UI::Root;
3174	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4266	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3175		4267
3176	1	4268	1
3177		4269

Diff Legend

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