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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

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