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.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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