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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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