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.215 by root, Fri May 19 03:49:48 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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