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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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