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

Diff Legend

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