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

Diff Legend

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