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

Diff Legend

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