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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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