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

Diff Legend

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