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

Diff Legend

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