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

Diff Legend

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