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

Diff Legend

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