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

Diff Legend

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